# HG changeset patch # User morphbr # Date 1183534716 -3600 # Node ID 366b0fd1eead9d92f0ce6f09468904b19e7cab89 # Parent 361cb0686ff701db4665c9fa68a1af60d8704f3e [svn r780] - Bug fix on serve_file_info diff -r 361cb0686ff7 -r 366b0fd1eead gmyth-stream/server/0.3/lib/file_handler.py --- a/gmyth-stream/server/0.3/lib/file_handler.py Wed Jul 04 08:33:19 2007 +0100 +++ b/gmyth-stream/server/0.3/lib/file_handler.py Wed Jul 04 08:38:36 2007 +0100 @@ -36,7 +36,7 @@ pickle.dump(self.opts, output, -1) output.close() else: - name = os.path.splitext(os.path.basename(filename))[0] + name = os.path.basename(filename) pkl_file = open(".transcoded/%s.dat" % name, "rb") self.opts = pickle.load(pkl_file) # __init__() diff -r 361cb0686ff7 -r 366b0fd1eead gmyth-stream/server/0.3/lib/request_handler.py --- a/gmyth-stream/server/0.3/lib/request_handler.py Wed Jul 04 08:33:19 2007 +0100 +++ b/gmyth-stream/server/0.3/lib/request_handler.py Wed Jul 04 08:38:36 2007 +0100 @@ -340,11 +340,10 @@ self.end_headers() try: - filename = file_dat.split(".dat")[0] opts = files.TranscodedFile(filename, self.query).opts for key in opts.keys(): self.wfile.write("%s=%s
" % (key, opts.get(key, "None"))) - except: + except Exception, e: self.send_error(500, str(e)) return # serve_file_info()