audiogen complains better

This commit is contained in:
boyska 2016-07-19 17:11:36 +02:00
parent 366c723266
commit 0ca94d7d85
2 changed files with 18 additions and 10 deletions

View file

@ -21,10 +21,14 @@ def get_parser():
def read_spec(fname):
if fname == '-':
return json.load(sys.stdin)
with open(fname) as buf:
return json.load(buf)
try:
if fname == '-':
return json.load(sys.stdin)
with open(fname) as buf:
return json.load(buf)
except ValueError:
sys.stderr.write("Error: invalid JSON\n")
sys.exit(1)
def check_spec(spec):
@ -45,7 +49,7 @@ def main():
if errors:
log.error("Errors in audiospec")
for err in errors:
print(err) # TODO: to stderr
sys.stderr.write('Error: {}\n'.format(err))
sys.exit(1)
for path in audiogenerate(spec):
print(path)

View file

@ -31,10 +31,14 @@ def get_parser():
def read_spec(fname):
if fname == '-':
return json.load(sys.stdin)
with open(fname) as buf:
return json.load(buf)
try:
if fname == '-':
return json.load(sys.stdin)
with open(fname) as buf:
return json.load(buf)
except ValueError:
sys.stderr.write("Error: invalid JSON\n")
sys.exit(1)
def check_spec(spec):
@ -61,7 +65,7 @@ def main():
if errors:
log.error("Errors in timespec")
for err in errors:
print(err) # TODO: to stderr
sys.stderr.write('Error: {}\n'.format(err))
sys.exit(1)
now = None if args.now is None else args.now.pop()
howmany = None if args.howmany is None else args.howmany.pop()