Ivars 5 anos atrás
pai
commit
bfbebcabe2
2 arquivos alterados com 4 adições e 2 exclusões
  1. 3
    1
      ContentSources.py
  2. 1
    1
      playstreamproxy.py

+ 3
- 1
ContentSources.py Ver arquivo

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

+ 1
- 1
playstreamproxy.py Ver arquivo

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