[svn r780] - Bug fix on serve_file_info trunk
authormorphbr
Wed Jul 04 08:38:36 2007 +0100 (2007-07-04)
branchtrunk
changeset 774366b0fd1eead
parent 773 361cb0686ff7
child 775 7cd98c74da22
[svn r780] - Bug fix on serve_file_info
gmyth-stream/server/0.3/lib/file_handler.py
gmyth-stream/server/0.3/lib/request_handler.py
     1.1 --- a/gmyth-stream/server/0.3/lib/file_handler.py	Wed Jul 04 08:33:19 2007 +0100
     1.2 +++ b/gmyth-stream/server/0.3/lib/file_handler.py	Wed Jul 04 08:38:36 2007 +0100
     1.3 @@ -36,7 +36,7 @@
     1.4              pickle.dump(self.opts, output, -1)
     1.5              output.close()
     1.6          else:
     1.7 -            name = os.path.splitext(os.path.basename(filename))[0]
     1.8 +            name = os.path.basename(filename)
     1.9              pkl_file = open(".transcoded/%s.dat" % name, "rb")
    1.10              self.opts = pickle.load(pkl_file)
    1.11      # __init__()
     2.1 --- a/gmyth-stream/server/0.3/lib/request_handler.py	Wed Jul 04 08:33:19 2007 +0100
     2.2 +++ b/gmyth-stream/server/0.3/lib/request_handler.py	Wed Jul 04 08:38:36 2007 +0100
     2.3 @@ -340,11 +340,10 @@
     2.4                  self.end_headers()
     2.5  
     2.6                  try:
     2.7 -                    filename = file_dat.split(".dat")[0]
     2.8                      opts = files.TranscodedFile(filename, self.query).opts
     2.9                      for key in opts.keys():
    2.10                          self.wfile.write("%s=%s<br>" % (key, opts.get(key, "None")))
    2.11 -                except:
    2.12 +                except Exception, e:
    2.13                      self.send_error(500, str(e))
    2.14                      return
    2.15      # serve_file_info()