labojumi

ContentSources.py

@@ -21,6 +21,8 @@ class ContentSources(object):
     def __init__(self, plugin_path, cfg_file="streams.cfg", cfg_file2=None):
         self.plugins = {}
         self.error_content = [("..atpakaļ", "back", "back.png", "Kļūda, atgriezties atpakaļ")]
+        if not plugin_path:
+            plugin_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "sources")
         sys.path.insert(0, plugin_path)
         #for f in os.listdir(plugin_path):
         #for f in next(os.walk(plugin_path))[2]:
@@ -31,7 +33,7 @@ class ContentSources(object):
             fname = os.path.split(fname)[1]
             if fname == "__init__": continue
             if ext == '.py':
-                print "Importing %s"%fname
+                #print "Importing %s"%fname
                 mod = __import__(fname)
                 reload(mod)
                 if "Source" in dir(mod):

playstreamproxy.py

@@ -57,7 +57,7 @@ slinks = {}
 sessions = {}
 
 cfg_file = "streams.cfg"
-sources = ContentSources("sources", cfg_file)
+sources = ContentSources("", cfg_file)
 
 class StreamHandler(BaseHTTPRequestHandler):