Changeset 313

Timestamp:

Jul 19, 2011, 1:08:43 PM (13 years ago)

Author:

Rick van der Zwet

Message:

Use argparse for argument parsing instead of some random hacks

File:

• py-tcpmultiplexer/TCPMultiplexer.py (modified) (5 diffs)

py-tcpmultiplexer/TCPMultiplexer.py

@@ -1 +1 @@
 #!/usr/bin/env python
-#
+"""
 # Multiplexer for HTTP streams, used for broadcast of MPJEG and WAV streams
 #
@@ -6 +6 @@
 #
 # Rick van der Zwet <info@rickvanderzwet.nl>
-#
+"""
+
 import SocketServer
 import argparse
@@ -17 +18 @@
 # Some boring defaults
 DEFAULT_HOST = '0.0.0.0'
-DEFAULT_PORT = '9999'
+DEFAULT_PORT = 9999
+DEFAULT_CONFIG = 'streams.yaml'
+
+# URL : TARGET
+DEFAULT_STREAMS = {
+  '/cam1/video' : 'http://172.16.0.67:8080/videofeed',
+  '/cam1/audio' : 'http://172.16.0.67:8080/audio.wav',
+  }
 
 # Global variables used as ring-buffers or shared-storage
@@ -117 +125 @@
 
 if __name__ == "__main__":
-  parser = argparse.ArgumentParser(description='Process some integers.')
+  parser = argparse.ArgumentParser(description=__doc__,formatter_class=argparse.RawDescriptionHelpFormatter)
+  parser.add_argument('--host', dest='host', default=DEFAULT_HOST, help='Listen to IP [default: %s]' % DEFAULT_HOST)
+  parser.add_argument('--port', dest='port', default=DEFAULT_PORT, type=int, help='Listen to PORT [default: %s]' % DEFAULT_PORT)
+  parser.add_argument('--stream-cfg', dest='stream_cfg', default=DEFAULT_CONFIG, help='YAML Stream configuration [default: %s]' % DEFAULT_CONFIG)
+  args = parser.parse_args()
 
-  # URL : TARGET
-  DEFAULT_STREAMS = {
-    '/cam1/video' : 'http://172.16.0.67:8080/videofeed',
-    '/cam1/audio' : 'http://172.16.0.67:8080/audio.wav',
-    }
-  # Flexible enough to specify using yaml file (sys.argv) as well
-  if len(sys.argv) > 1:
-    config_file = sys.argv[1]
-    try:
-      import yaml
-      streams = yaml.load(open(config_file))
-    except (ImportError, IOError) as e:
-      logging.error("Config file '%s' not readable or parsable (%s)", config_file, e)
+  # Inport streams
+  streams = DEFAULT_STREAMS
+  try:
+    import yaml
+    streams = yaml.load(open(args.stream_cfg))
+  except (ImportError, IOError) as e:
+    logging.warning("Stream config file '%s' not readable or parsable (%s)", args.stream_cfg, e)
 
 
-  HOST, PORT = "0.0.0.0", 9999
-  # Create the server
+  # Create the base server
   try:
     while True:
       try:
         ThreadedTCPServer.allow_reuse_address = True
-        server = ThreadedTCPServer((HOST, PORT), MyTCPHandler)
+        server = ThreadedTCPServer((args.host, args.port), MyTCPHandler)
         break
       except IOError, e:
-        logging.warning('For conection %s:%s to become available (%s)', HOST, PORT, e)
+        logging.warning('For conection %s:%s to become available (%s)', args.host, args.port , e)
         time.sleep(1)
   except KeyboardInterrupt:
@@ -156 +161 @@
   # interrupt the program with Ctrl-C
   try:
-    logging.info('Serving at %s:%s', HOST,PORT)
+    logging.info('Serving at %s:%s', args.host, args.port)
     server.serve_forever()
   except KeyboardInterrupt, IOError: