From 4f1a195ef49044250267051542ff545132a6b27d Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Sat, 9 Aug 2014 12:18:57 +0300 Subject: [PATCH] move wave.py __main__ part to scripts. --- amodem/wave.py | 32 -------------------------------- scripts/wave.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 32 deletions(-) mode change 100755 => 100644 amodem/wave.py create mode 100755 scripts/wave.py diff --git a/amodem/wave.py b/amodem/wave.py old mode 100755 new mode 100644 index 269c66f..bbc9744 --- a/amodem/wave.py +++ b/amodem/wave.py @@ -32,35 +32,3 @@ def launch(*args, **kwargs): p = sp.Popen(args=args, **kwargs) p.stop = lambda: os.kill(p.pid, signal.SIGKILL) return p - -if __name__ == '__main__': - import logging - logging.basicConfig(level=logging.DEBUG, format='%(message)s') - import argparse - parser = argparse.ArgumentParser() - subparsers = parser.add_subparsers() - fmt = 'a raw audio file (16 bits at {:.1f} kHz)'.format(Fs / 1e3) - recorder = subparsers.add_parser('record', help='record ' + fmt) - recorder.add_argument( - 'filename', default='-', - help='path to the audio file to record (otherwise, use stdout)') - recorder.set_defaults(func=record) - - player = subparsers.add_parser('play', help='play ' + fmt) - player.add_argument( - 'filename', default='-', - help='path to the audio file to play (otherwise, use stdin)') - player.set_defaults(func=play) - - args = parser.parse_args() - p = args.func(args.filename) - - import sys - exitcode = 0 - try: - exitcode = p.wait() - except KeyboardInterrupt: - p.kill() - exitcode = p.wait() - - sys.exit(exitcode) diff --git a/scripts/wave.py b/scripts/wave.py new file mode 100755 index 0000000..3337d0e --- /dev/null +++ b/scripts/wave.py @@ -0,0 +1,33 @@ +import logging +logging.basicConfig(level=logging.DEBUG, format='%(message)s') + +from amodem import wave + +import argparse +parser = argparse.ArgumentParser() +subparsers = parser.add_subparsers() +fmt = 'a raw audio file (16 bits at {:.1f} kHz)'.format(wave.Fs / 1e3) +recorder = subparsers.add_parser('record', help='record ' + fmt) +recorder.add_argument( + 'filename', default='-', + help='path to the audio file to record (otherwise, use stdout)') +recorder.set_defaults(func=wave.record) + +player = subparsers.add_parser('play', help='play ' + fmt) +player.add_argument( + 'filename', default='-', + help='path to the audio file to play (otherwise, use stdin)') +player.set_defaults(func=wave.play) + +args = parser.parse_args() +p = args.func(args.filename) + +import sys +exitcode = 0 +try: + exitcode = p.wait() +except KeyboardInterrupt: + p.kill() + exitcode = p.wait() + +sys.exit(exitcode)