# HG changeset patch # User drewp@bigasterisk.com # Date 1536137474 25200 # Node ID c1d38b884a2eef4d2c6829149a3f6693be6af760 # Parent 45c8edddf01a68a13aacacd10044730ae188b9f6 switch to docopt, add -v Ignore-this: 1fbc97d2ead1396652d9af9adf5637b diff -r 45c8edddf01a -r c1d38b884a2e service/audioInputLevels/audioInputLevelsPulse.py --- a/service/audioInputLevels/audioInputLevelsPulse.py Wed Sep 05 01:45:45 2018 -0700 +++ b/service/audioInputLevels/audioInputLevelsPulse.py Wed Sep 05 01:51:14 2018 -0700 @@ -1,8 +1,9 @@ # based on http://freshfoo.com/blog/pulseaudio_monitoring from __future__ import division -import socket, argparse, time, logging, os +import socket, time, logging, os from Queue import Queue from ctypes import POINTER, c_ubyte, c_void_p, c_ulong, cast +from docopt import docopt from influxdb import InfluxDBClient # From https://github.com/Valodim/python-pulseaudio @@ -106,17 +107,19 @@ P.pa_stream_drop(stream) def main(): - parser = argparse.ArgumentParser() - parser.add_argument( - '--source', required=True, - help='pulseaudio source name (use `pactl list sources | grep Name`)') + arg = docopt(""" + Usage: audioInputLevelsPulse.py [-v] --source= - args = parser.parse_args() + --source= pulseaudio source name (use `pactl list sources | grep Name`) + -v Verbose + """) + + log.setLevel(logging.DEBUG if arg['-v'] else logging.INFO) influx = InfluxDBClient('bang6', 9060, 'root', 'root', 'main') hostname = socket.gethostname() - monitor = PeakMonitor(args.source, METER_RATE) + monitor = PeakMonitor(arg['--source'], METER_RATE) for sample in monitor: log.debug(' %3d %s', sample, '>' * sample) influx.write_points([{'measurement': 'audioLevel', diff -r 45c8edddf01a -r c1d38b884a2e service/audioInputLevels/makefile --- a/service/audioInputLevels/makefile Wed Sep 05 01:45:45 2018 -0700 +++ b/service/audioInputLevels/makefile Wed Sep 05 01:51:14 2018 -0700 @@ -17,5 +17,5 @@ -v `pwd`:/mnt \ --net=host \ bang6:5000/audio_input_levels_x86:latest \ - python /mnt/audioInputLevelsPulse.py --source alsa_input.pci-0000_00_1f.3.analog-stereo + python /mnt/audioInputLevelsPulse.py --source alsa_input.pci-0000_00_1f.3.analog-stereo -v diff -r 45c8edddf01a -r c1d38b884a2e service/audioInputLevels/requirements.txt --- a/service/audioInputLevels/requirements.txt Wed Sep 05 01:45:45 2018 -0700 +++ b/service/audioInputLevels/requirements.txt Wed Sep 05 01:51:14 2018 -0700 @@ -1,2 +1,3 @@ git+http://github.com/dvarrazzo/python-pulseaudio.git@53f10e5cf9ac3d7b49d7859af6006850d63b6d6a#egg=python-pulseaudio influxdb==3.0.0 +docopt