Changeset 318 for py-tcpmultiplexer

Timestamp:

Jul 19, 2011, 3:41:33 PM (13 years ago)

Author:

Rick van der Zwet

Message:

First picture needs to valid for stream to be parsed correctly.

File:

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

py-tcpmultiplexer/TCPMultiplexer.py

@@ -70 +70 @@
             self.request.send("</ul><h3>Files</h3><ul>")
             for root, dirs, files in os.walk(document_root):
+              # Please do not show any hidden files or directories
+              [dirs.remove(name) for name in dirs if name.startswith('.')]
+              [files.remove(name) for name in files if name.startswith('.')]
               for name in files:
                 self.request.send('<li><a href="%(item)s">%(item)s</li>' % { 'item' : os.path.join(root.replace(document_root,'',1),name) })
-              # Please do not show any hidden file
-              [dirs.remove(name) for name in dirs if name.startswith('.')]
             self.request.send("</ul></body></html>")
           elif urldata.has_key(urlid):
@@ -120 +121 @@
 
       if datatype == 'wav':
+        # WAV header
         dataheader[urlid] = f.read(44)
       elif datatype == 'mjeg':
-        dataheader[urlid] = '\n'.join(f.read(100).split('\n')[0:2])
+        # Get rid of Content-Length as not all pictures suits this setup
+        headers = f.read(100).splitlines()[0:3]
+        logger.info("Image headers %s", headers)
+        valid_image = headers[0] + f.read(100000).split(headers[0])[1]
+        dataheader[urlid] = valid_image + '\n'.join([h for h in headers if not h.startswith('Content-length:')]) + '\n'
       else:
         dataheader[urlid] = ''
+
+      logger.info("Using dataheader of length %s", len(dataheader[urlid]))
 
       while running:
@@ -156 +164 @@
   try:
     import yaml
-    streams = yaml.load(open(args.stream_cfg))
+    streams.update(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)