[Gmyth-commits] SF.net SVN: gmyth: [830] trunk/gmyth-stream/server/0.3

[<me...@us...>]

Revision: 830
          http://gmyth.svn.sourceforge.net/gmyth/?rev=830&view=rev
Author:   melunko
Date:     2007-08-23 12:24:11 -0700 (Thu, 23 Aug 2007)

Log Message:
-----------
fixed config file to expand dir

Modified Paths:
--------------
    trunk/gmyth-stream/server/0.3/lib/gmsconfig.py
    trunk/gmyth-stream/server/0.3/lib/request_handler.py
    trunk/gmyth-stream/server/0.3/server.conf

Modified: trunk/gmyth-stream/server/0.3/lib/gmsconfig.py
===================================================================
--- trunk/gmyth-stream/server/0.3/lib/gmsconfig.py	2007-08-23 13:24:46 UTC (rev 829)
+++ trunk/gmyth-stream/server/0.3/lib/gmsconfig.py	2007-08-23 19:24:11 UTC (rev 830)
@@ -16,12 +16,11 @@
     __CONFIG_FILE__ = "server.conf"
     __CONFIG_DIRS__ =  [os.path.join (os.path.expanduser("~"), ".gms"), \
                        os.path.join ("/", "etc", "gms"), \
-                       "."]
+		       "."]
 
     def __init__(self):
         for path in self.__CONFIG_DIRS__:
             file_name = os.path.join (path, self.__CONFIG_FILE__)
-            print "test config file: %s" % file_name
             if os.path.exists (file_name):
                 fp = open (file_name, "r")
                 self.config.readfp (fp)
@@ -30,7 +29,7 @@
 
     def get_transcoded_location (self):
         try:
-            return self.config.get("PATHS", "transcoded")
+            return os.path.realpath (self.config.get("PATHS", "transcoded"))
         except:
             return None
     # get_transcoded_location()

Modified: trunk/gmyth-stream/server/0.3/lib/request_handler.py
===================================================================
--- trunk/gmyth-stream/server/0.3/lib/request_handler.py	2007-08-23 13:24:46 UTC (rev 829)
+++ trunk/gmyth-stream/server/0.3/lib/request_handler.py	2007-08-23 19:24:11 UTC (rev 830)
@@ -355,8 +355,12 @@
     # serve_file_info()
 
     def serve_stream(self, body):
-        filename = self.query.get("file", None)[0]
+	args = self.query.get("file", None)
+	if not args:
+	    self.send_error(404, "File not found")
+	    return
 
+        filename = args[0];	
         if not filename:
             self.send_error(404, "File not found")
             return

Modified: trunk/gmyth-stream/server/0.3/server.conf
===================================================================
--- trunk/gmyth-stream/server/0.3/server.conf	2007-08-23 13:24:46 UTC (rev 829)
+++ trunk/gmyth-stream/server/0.3/server.conf	2007-08-23 19:24:11 UTC (rev 830)
@@ -1,2 +1,2 @@
 [PATHS]
-transcoded=.transcoded
+transcoded=./.transcoded


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.