parametrizējams streams.cfg

ContentSources.py

@@ -18,7 +18,7 @@ class ContentSources(object):
     """Wrapper for content sources plugin"""
 
     #----------------------------------------------------------------------
-    def __init__(self, plugin_path):
+    def __init__(self, plugin_path, cfg_file="streams.cfg"):
         self.plugins = {}
         self.error_content = [("..atpakaļ", "back", "back.png", "Kļūda, atgriezties atpakaļ")]
         sys.path.insert(0, plugin_path)
@@ -35,7 +35,10 @@ class ContentSources(object):
                 mod = __import__(fname)
                 reload(mod)
                 if "Source" in dir(mod):
-                    self.plugins[fname] = mod.Source()
+                    if mod.__name__ == "config":
+                        self.plugins[fname] = mod.Source(cfg_file=cfg_file)
+                    else:
+                        self.plugins[fname] = mod.Source()
                     print fname+ " imported"
                 else:
                     pass
@@ -174,9 +177,7 @@ class ContentSources(object):
 if __name__ == "__main__":
     from run import run
     show_hidden = False
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "config::home"
-    sources = ContentSources("sources")
+    data= sys.argv[1] if len(sys.argv) > 1 else "config::home"
+    cfg_file = sys.argv[2] if len(sys.argv) > 2 else "streams.cfg"
+    sources = ContentSources("sources", cfg_file=cfg_file)
     run(sources, data)

project.wpr

@@ -12,7 +12,7 @@ proj.directory-list = [{'dirloc': loc('.'),
                         'watch_for_changes': True}]
 proj.file-type = 'normal'
 proj.launch-config = {loc('ContentSources.py'): ('project',
-        (u'ltc::home',
+        (u'config::home streams_bernu.cfg',
          '')),
                       loc('iub_db.py'): ('project',
         (u'-d 90   -s -o',
@@ -28,9 +28,16 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
         '')),
                       loc('iubx2.py'): ('project',
         (u'-sgr -d 10',
-         ''))}
+         '')),
+                      loc('run.py'): ('project',
+                                      (u'config::home  streams_bernu.cfg',
+                                       ''))}
 [user attributes]
-debug.breakpoints = {loc('iub.py'): {102: (0,
+debug.breakpoints = {loc('ContentSources.py'): {39L: (0,
+        None,
+        1,
+        0)},
+                     loc('iub.py'): {102: (0,
         None,
         1,
         0),
@@ -103,7 +110,8 @@ debug.err-values = {None: {},
                     loc('sources/filmix.py'): {},
                     loc('sources/ltc.py'): {},
                     loc('test_sources2.py'): {}}
-debug.recent-run-args = {loc('ContentSources.py'): [u'ltc::home',
+debug.recent-run-args = {loc('ContentSources.py'): [u'config::home streams_bernu.cfg',
+        u'ltc::home',
         u'config::home'],
                          loc('iub_db.py'): [u'-d 90   -s -o',
         u'-d 40   -rg -o',
@@ -144,7 +152,10 @@ debug.recent-run-args = {loc('ContentSources.py'): [u'ltc::home',
         u'-sgr',
         u'--sgr',
         u'--slud'],
-                         loc('run.py'): [u'config::home']}
+                         loc('run.py'): [u'config::home  streams_bernu.cfg',
+        u'config::home ',
+        u'config::home streams_bernu.cfg',
+        u'config::home']}
 debug.run-args = {}
 debug.var-col-widths = [0.41872791519434627,
                         0.5812720848056537]
@@ -163,9 +174,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'view': {'area': 'tall',
                  'constraint': None,
                  'current_pages': [0,
-                                   1],
+                                   0],
                  'full-screen': False,
-                 'notebook_display': 'tabs only',
+                 'notebook_display': 'normal',
                  'notebook_percent': 0.17992831541218635,
                  'override_title': None,
                  'pagelist': [('project',
@@ -767,7 +778,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': '',
                                        'fReverse': False,
-                                       'fSearchText': u'img',
+                                       'fSearchText': u'ConfigSou',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -841,88 +852,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 2L,
+                       'first-line': 17L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/cinemalive.py': ["m"\
-        " = re.search(r\"'https\\|.+?jwplayer'\", r2)\n",
-        "m = re.search(r\"'https\\|.+?jwplayer'\", r)\n",
-        'm\n',
-        'm.start\n',
-        'm.string\n',
-        'p\n',
-        'p0 = m.group(1)\n',
-        'p0\n',
-        'm.group\n',
-        'm.group()\n',
-        'm.groupw\n',
-        'm[1]\n',
-        'm.groups()\n',
-        'm.groups(2)\n',
-        'm.groups(0)\n',
-        'm.group(0)\n',
-        'm.groups(1)\n',
-        'print url_sub\n',
-        'url_sub\n',
-        ' https://dl4.sanii.co/files/8/80mbh8zjyuh61n/video.mp4\n',
-        'url\n',
-        'print url\n',
-        'print p0\n',
-        'm.group(1)\n',
-        's\n',
-        'print r\n',
-        'clist\n',
-        'item\n',
-        'data\n'],
-                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/filmix.py': ['r'\
-        '.text\n',
-        'r.cookies\n',
-        'data = "scf=fx&story=big+bang&search_start=0&do=search&subaction=se'\
-        'arch"\n',
-        'ses.post("https://filmix.me/engine/ajax/sphinx_search.php", data=No'\
-        'ne, json=None)\n',
-        'r2.content\n',
-        'clist\n',
-        'plist\n',
-        'r2 = ses.post("https://filmix.me/engine/ajax/sphinx_search.php", da'\
-        'ta=None, json=None)\n',
-        'len(plist)\n',
-        'r\n',
-        'print r.content\n',
-        'print desc0\n',
-        'print desc\n',
-        'r.content\n',
-        'title\n',
-        'zip(rezult)\n',
-        'zip(resultult)\n',
-        'zip(result)\n',
-        'zip(result)[0]\n',
-        'print result\n',
-        'print result[0]\n',
-        'print result[1]\n',
-        '*zip(result)\n',
-        'zip(*result)\n',
-        'zip(*result)[0]\n',
-        '" ".join(zip(*result)[0])\n',
-        'print " ".join(zip(*result)[0])\n',
-        '"\\n".join(props)\n',
-        'print r2\n',
-        'result[2]\n',
-        'result[1]\n',
-        'result[0]\n',
-        'result[0][0]\n',
-        'result = re.findall("<span>(.+?)(&nbsp;)*</span>", m.group(1))\n',
-        'actors = zip(*result)[0])\n',
-        'actors = zip(*result)[0]\n',
-        're.sub("<.+?>", "", result[0][0])\n',
-        'actors\n',
-        'result\n',
-        'm\n',
-        'print m.group(1)\n']},
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/run.py': ['m'\
+        'od\n',
+        'dir(mod)\n',
+        'mod.__name__\n']},
                        'launch-id': None,
-                       'sel-line': 11L,
-                       'sel-line-start': 6555L,
-                       'selection_end': 6555L,
-                       'selection_start': 6555L,
+                       'sel-line': 24L,
+                       'sel-line-start': 315L,
+                       'selection_end': 327L,
+                       'selection_start': 315L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -958,413 +898,261 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 20L,
+                       'first-line': 0L,
                        'folded-linenos': [],
-                       'history': {None: ['import base64\n',
-        "s = \"'d2luZG93LkNTU1ZpZXdwb3J0UnVsZXMgPSB0cnVlOyhmdW5jdGlvbihkb2N1"\
-        "bWVudCwgc2NyaXB0RWxlbWVudCwgZmlyc3RTY3JpcHQpIHtzY3JpcHRFbGVtZW50ID0"\
-        "gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc2NyaXB0Jyk7c2NyaXB0Q0ZBU3luYyA9IG"\
-        "RvY3VtZW50LmNyZWF0ZUF0dHJpYnV0ZSgiZGF0YS1jZmFzeW5jIik7c2NyaXB0Q0ZBU"\
-        "3luYy52YWx1ZSA9IGZhbHNlO3NjcmlwdEVsZW1lbnQuc2V0QXR0cmlidXRlTm9kZShz"\
-        "Y3JpcHRDRkFTeW5jKTtzY3JpcHRFbGVtZW50LnNyYyA9ICcvL3BhZ2VhZDIuZ29vZ2x"\
-        "lc3luZGljYXRpb24uY29tL3BhZ2VhZC9qcy9hZHNieWdvb2dsZS5qcyc7c2NyaXB0RW"\
-        "xlbWVudC5vbmVycm9yID0gZnVuY3Rpb24gKCkgeyB3aW5kb3cuQ1NTVmlld3BvcnRSd"\
-        "Wxlcz1mYWxzZTsgfTsgdmFyIGZpcnN0U2NyaXB0O2lmICh0eXBlb2YgZG9jdW1lbnQu"\
-        "c2NyaXB0cyAhPT0gJ3VuZGVmaW5lZCcpIHsgZmlyc3RTY3JpcHQgPSBkb2N1bWVudC5"\
-        "zY3JpcHRzWzBdOyB9IGlmICh0eXBlb2YgZmlyc3RTY3JpcHQgPT0gJ3VuZGVmaW5lZC"\
-        "cpIHsgZmlyc3RTY3JpcHQgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnc"\
-        "2NyaXB0JylbMF07IH0gZmlyc3RTY3JpcHQucGFyZW50Tm9kZS5pbnNlcnRCZWZvcmUo"\
-        "c2NyaXB0RWxlbWVudCwgZmlyc3RTY3JpcHQpOyB9KGRvY3VtZW50KSk7CihmdW5jdGl"\
-        "vbigpeyB2YXIgd2FzX2luaXQgPSBmYWxzZTsgZnVuY3Rpb24gaW5pdF9teXNjcmlwdC"\
-        "gpIHsgaWYgKHdhc19pbml0KSByZXR1cm4gOyB3YXNfaW5pdCA9IHRydWU7IHZhciBjP"\
-        "WRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpO2MuaW5uZXJIVE1MPSImbmJzcDsi"\
-        "O2MuY2xhc3NOYW1lPSJhZHNib3giO2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoYyk"\
-        "7d2luZG93LnNldFRpbWVvdXQoZnVuY3Rpb24oKXtpZigwPT09Yy5vZmZzZXRIZWlnaH"\
-        "R8fHdpbmRvdy5DU1NWaWV3cG9ydFJ1bGVzPT09ZmFsc2Upe3ZhciBsPTAsZD1uZXcgK"\
-        "HdpbmRvdy5SVENQZWVyQ29ubmVjdGlvbnx8d2luZG93Lm1velJUQ1BlZXJDb25uZWN0"\
-        "aW9ufHx3aW5kb3cud2Via2l0UlRDUGVlckNvbm5lY3Rpb24pKHtpY2VTZXJ2ZXJzOlt"\
-        "7dXJsOiJzdHVuOjE3NTUwMDE4MjY6NDQzIn1dfSx7b3B0aW9uYWw6W3tSdHBEYXRhQ2"\
-        "hhbm5lbHM6ITB9XX0pO2Qub25pY2VjYW5kaWRhdGU9ZnVuY3Rpb24oYil7dmFyIGU9I"\
-        "iI7IWIuY2FuZGlkYXRlfHwoYi5jYW5kaWRhdGUgJiYgYi5jYW5kaWRhdGUuY2FuZGlk"\
-        "YXRlLmluZGV4T2YoJ3NyZmx4JykgPT0gLTEpfHwhKGI9LyhbMC05XXsxLDN9KFwuWzA"\
-        "tOV17MSwzfSl7M318W2EtZjAtOV17MSw0fSg6W2EtZjAtOV17MSw0fSl7N30pLy5leG"\
-        "VjKGIuY2FuZGlkYXRlLmNhbmRpZGF0ZSlbMV0pfHwKbXx8Yi5tYXRjaCgvXigxOTJcL"\
-        "jE2OFwufDE2OVwuMjU0XC58MTBcLnwxNzJcLigxWzYtOV18MlxkfDNbMDFdKSkvKXx8"\
-        "Yi5tYXRjaCgvXlthLWYwLTldezEsNH0oOlthLWYwLTldezEsNH0pezd9JC8pfHwobT0"\
-        "hMCxlPWIsZG9jdW1lbnQub25jbGljaz1mdW5jdGlvbigpe2N1cnJlbnRfY291bnQ9cG"\
-        "Fyc2VJbnQoKGRvY3VtZW50LmNvb2tpZS5tYXRjaCgibm9wcnB5dXd6Y3BnZG9sbXNjb"\
-        "nQ9KFteO10uKz8pKDt8JCkiKXx8W10pWzFdfHwwKTtpZighbCYmMjE0NzQ4MzY0Nj5j"\
-        "dXJyZW50X2NvdW50KXtsPTE7dmFyIGE9ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYSI"\
-        "pLGI9TWF0aC5mbG9vcigxRTEyKk1hdGgucmFuZG9tKCkpLGY9TWF0aC5yYW5kb20oKS"\
-        "50b1N0cmluZygzNikucmVwbGFjZSgvW15hLXpBLVowLTldKy9nLCIiKS5zdWJzdHIoM"\
-        "CwxMCk7YS5ocmVmPSJodHRwOi8vIitlKyIvIituLmVuY29kZShiKyIvIisoMTYyNDc0"\
-        "OStiKSsiLyIrZik7YS50YXJnZXQ9Il9ibGFuayI7ZG9jdW1lbnQuYm9keS5hcHBlbmR"\
-        "DaGlsZChhKTsKYj1uZXcgTW91c2VFdmVudCgiY2xpY2siLHt2aWV3OndpbmRvdyxidW"\
-        "JibGVzOiExLGNhbmNlbGFibGU6ITF9KTthLmRpc3BhdGNoRXZlbnQoYik7YS5wYXJlb"\
-        "nROb2RlLnJlbW92ZUNoaWxkKGEpO2E9bmV3IERhdGU7YS5zZXRUaW1lKGEuZ2V0VGlt"\
-        "ZSgpKzg2NDAwMDAwKTtiX2RhdGU9KGV4aXN0aW5nX2RhdGU9dW5lc2NhcGUoKGRvY3V"\
-        "tZW50LmNvb2tpZS5tYXRjaCgibm9wcnB5dXd6Y3BnZG9sbXNleHA9KFteO10uKz8pKD"\
-        "t8JCkiKXx8W10pWzFdfHwiIikpP2V4aXN0aW5nX2RhdGU6YS50b0dNVFN0cmluZygpO"\
-        "2E9IjsgZXhwaXJlcz0iK2JfZGF0ZTtkb2N1bWVudC5jb29raWU9Im5vcHJweXV3emNw"\
-        "Z2RvbG1zY250PSIrKGN1cnJlbnRfY291bnQrMSkrYSsiOyBwYXRoPS8iO2RvY3VtZW5"\
-        "0LmNvb2tpZT0ibm9wcnB5dXd6Y3BnZG9sbXNleHA9IitiX2RhdGUrYSsiOyBwYXRoPS"\
-        "8ifX0pfTtkLmNyZWF0ZURhdGFDaGFubmVsKCIiKTtkLmNyZWF0ZU9mZmVyKGZ1bmN0a"\
-        "W9uKGIpe2Quc2V0TG9jYWxEZXNjcmlwdGlvbihiLGZ1bmN0aW9uKCl7fSxmdW5jdGlv"\
-        "bigpe30pfSwKZnVuY3Rpb24oKXt9KX1NYXRoLnJhbmRvbSgpLnRvU3RyaW5nKDM2KS5"\
-        "yZXBsYWNlKC9bXmEtekEtWjAtOV0rL2csIiIpLnN1YnN0cigwLDEwKTt2YXIgbT0hMS"\
-        "xuPXtfMDoiQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wc"\
-        "XJzdHV2d3h5ejAxMjM0NTY3ODkrLz0iLGVuY29kZTpmdW5jdGlvbihiKXtmb3IodmFy"\
-        "IGU9IiIsYSxjLGYsZCxrLGcsaD0wO2g8Yi5sZW5ndGg7KWE9Yi5jaGFyQ29kZUF0KGg"\
-        "rKyksYz1iLmNoYXJDb2RlQXQoaCsrKSxmPWIuY2hhckNvZGVBdChoKyspLGQ9YT4+Mi"\
-        "xhPShhJjMpPDw0fGM+PjQsaz0oYyYxNSk8PDJ8Zj4+NixnPWYmNjMsaXNOYU4oYyk/a"\
-        "z1nPTY0OmlzTmFOKGYpJiYoZz02NCksZT1lK3RoaXMuXzAuY2hhckF0KGQpK3RoaXMu"\
-        "XzAuY2hhckF0KGEpK3RoaXMuXzAuY2hhckF0KGspK3RoaXMuXzAuY2hhckF0KGcpO3J"\
-        "ldHVybiBlfX19LDQwMCkgfSBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJET01Db2"\
-        "50ZW50TG9hZGVkIiwgZnVuY3Rpb24gKCkgeyBpbml0X215c2NyaXB0KCk7IH0gKTsgd"\
-        "2luZG93LnNldFRpbWVvdXQoaW5pdF9teXNjcmlwdCwgMTIwKSB9KSgpOw=='\"\n",
-        's\n',
-        'base64.decode(s)\n',
-        'base64.decode(s, s2)\n',
-        's = ""\n',
-        "s ='d2luZG93LkNTU1ZpZXdwb3J0UnVsZXMgPSB0cnVlOyhmdW5jdGlvbihkb2N1bWV"\
-        "udCwgc2NyaXB0RWxlbWVudCwgZmlyc3RTY3JpcHQpIHtzY3JpcHRFbGVtZW50ID0gZG"\
-        "9jdW1lbnQuY3JlYXRlRWxlbWVudCgnc2NyaXB0Jyk7c2NyaXB0Q0ZBU3luYyA9IGRvY"\
-        "3VtZW50LmNyZWF0ZUF0dHJpYnV0ZSgiZGF0YS1jZmFzeW5jIik7c2NyaXB0Q0ZBU3lu"\
-        "Yy52YWx1ZSA9IGZhbHNlO3NjcmlwdEVsZW1lbnQuc2V0QXR0cmlidXRlTm9kZShzY3J"\
-        "pcHRDRkFTeW5jKTtzY3JpcHRFbGVtZW50LnNyYyA9ICcvL3BhZ2VhZDIuZ29vZ2xlc3"\
-        "luZGljYXRpb24uY29tL3BhZ2VhZC9qcy9hZHNieWdvb2dsZS5qcyc7c2NyaXB0RWxlb"\
-        "WVudC5vbmVycm9yID0gZnVuY3Rpb24gKCkgeyB3aW5kb3cuQ1NTVmlld3BvcnRSdWxl"\
-        "cz1mYWxzZTsgfTsgdmFyIGZpcnN0U2NyaXB0O2lmICh0eXBlb2YgZG9jdW1lbnQuc2N"\
-        "yaXB0cyAhPT0gJ3VuZGVmaW5lZCcpIHsgZmlyc3RTY3JpcHQgPSBkb2N1bWVudC5zY3"\
-        "JpcHRzWzBdOyB9IGlmICh0eXBlb2YgZmlyc3RTY3JpcHQgPT0gJ3VuZGVmaW5lZCcpI"\
-        "HsgZmlyc3RTY3JpcHQgPSBkb2N1bWVudC5nZXRFbGVtZW50c0J5VGFnTmFtZSgnc2Ny"\
-        "aXB0JylbMF07IH0gZmlyc3RTY3JpcHQucGFyZW50Tm9kZS5pbnNlcnRCZWZvcmUoc2N"\
-        "yaXB0RWxlbWVudCwgZmlyc3RTY3JpcHQpOyB9KGRvY3VtZW50KSk7CihmdW5jdGlvbi"\
-        "gpeyB2YXIgd2FzX2luaXQgPSBmYWxzZTsgZnVuY3Rpb24gaW5pdF9teXNjcmlwdCgpI"\
-        "HsgaWYgKHdhc19pbml0KSByZXR1cm4gOyB3YXNfaW5pdCA9IHRydWU7IHZhciBjPWRv"\
-        "Y3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpO2MuaW5uZXJIVE1MPSImbmJzcDsiO2M"\
-        "uY2xhc3NOYW1lPSJhZHNib3giO2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoYyk7d2"\
-        "luZG93LnNldFRpbWVvdXQoZnVuY3Rpb24oKXtpZigwPT09Yy5vZmZzZXRIZWlnaHR8f"\
-        "HdpbmRvdy5DU1NWaWV3cG9ydFJ1bGVzPT09ZmFsc2Upe3ZhciBsPTAsZD1uZXcgKHdp"\
-        "bmRvdy5SVENQZWVyQ29ubmVjdGlvbnx8d2luZG93Lm1velJUQ1BlZXJDb25uZWN0aW9"\
-        "ufHx3aW5kb3cud2Via2l0UlRDUGVlckNvbm5lY3Rpb24pKHtpY2VTZXJ2ZXJzOlt7dX"\
-        "JsOiJzdHVuOjE3NTUwMDE4MjY6NDQzIn1dfSx7b3B0aW9uYWw6W3tSdHBEYXRhQ2hhb"\
-        "m5lbHM6ITB9XX0pO2Qub25pY2VjYW5kaWRhdGU9ZnVuY3Rpb24oYil7dmFyIGU9IiI7"\
-        "IWIuY2FuZGlkYXRlfHwoYi5jYW5kaWRhdGUgJiYgYi5jYW5kaWRhdGUuY2FuZGlkYXR"\
-        "lLmluZGV4T2YoJ3NyZmx4JykgPT0gLTEpfHwhKGI9LyhbMC05XXsxLDN9KFwuWzAtOV"\
-        "17MSwzfSl7M318W2EtZjAtOV17MSw0fSg6W2EtZjAtOV17MSw0fSl7N30pLy5leGVjK"\
-        "GIuY2FuZGlkYXRlLmNhbmRpZGF0ZSlbMV0pfHwKbXx8Yi5tYXRjaCgvXigxOTJcLjE2"\
-        "OFwufDE2OVwuMjU0XC58MTBcLnwxNzJcLigxWzYtOV18MlxkfDNbMDFdKSkvKXx8Yi5"\
-        "tYXRjaCgvXlthLWYwLTldezEsNH0oOlthLWYwLTldezEsNH0pezd9JC8pfHwobT0hMC"\
-        "xlPWIsZG9jdW1lbnQub25jbGljaz1mdW5jdGlvbigpe2N1cnJlbnRfY291bnQ9cGFyc"\
-        "2VJbnQoKGRvY3VtZW50LmNvb2tpZS5tYXRjaCgibm9wcnB5dXd6Y3BnZG9sbXNjbnQ9"\
-        "KFteO10uKz8pKDt8JCkiKXx8W10pWzFdfHwwKTtpZighbCYmMjE0NzQ4MzY0Nj5jdXJ"\
-        "yZW50X2NvdW50KXtsPTE7dmFyIGE9ZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiYSIpLG"\
-        "I9TWF0aC5mbG9vcigxRTEyKk1hdGgucmFuZG9tKCkpLGY9TWF0aC5yYW5kb20oKS50b"\
-        "1N0cmluZygzNikucmVwbGFjZSgvW15hLXpBLVowLTldKy9nLCIiKS5zdWJzdHIoMCwx"\
-        "MCk7YS5ocmVmPSJodHRwOi8vIitlKyIvIituLmVuY29kZShiKyIvIisoMTYyNDc0OSt"\
-        "iKSsiLyIrZik7YS50YXJnZXQ9Il9ibGFuayI7ZG9jdW1lbnQuYm9keS5hcHBlbmRDaG"\
-        "lsZChhKTsKYj1uZXcgTW91c2VFdmVudCgiY2xpY2siLHt2aWV3OndpbmRvdyxidWJib"\
-        "GVzOiExLGNhbmNlbGFibGU6ITF9KTthLmRpc3BhdGNoRXZlbnQoYik7YS5wYXJlbnRO"\
-        "b2RlLnJlbW92ZUNoaWxkKGEpO2E9bmV3IERhdGU7YS5zZXRUaW1lKGEuZ2V0VGltZSg"\
-        "pKzg2NDAwMDAwKTtiX2RhdGU9KGV4aXN0aW5nX2RhdGU9dW5lc2NhcGUoKGRvY3VtZW"\
-        "50LmNvb2tpZS5tYXRjaCgibm9wcnB5dXd6Y3BnZG9sbXNleHA9KFteO10uKz8pKDt8J"\
-        "CkiKXx8W10pWzFdfHwiIikpP2V4aXN0aW5nX2RhdGU6YS50b0dNVFN0cmluZygpO2E9"\
-        "IjsgZXhwaXJlcz0iK2JfZGF0ZTtkb2N1bWVudC5jb29raWU9Im5vcHJweXV3emNwZ2R"\
-        "vbG1zY250PSIrKGN1cnJlbnRfY291bnQrMSkrYSsiOyBwYXRoPS8iO2RvY3VtZW50Lm"\
-        "Nvb2tpZT0ibm9wcnB5dXd6Y3BnZG9sbXNleHA9IitiX2RhdGUrYSsiOyBwYXRoPS8if"\
-        "X0pfTtkLmNyZWF0ZURhdGFDaGFubmVsKCIiKTtkLmNyZWF0ZU9mZmVyKGZ1bmN0aW9u"\
-        "KGIpe2Quc2V0TG9jYWxEZXNjcmlwdGlvbihiLGZ1bmN0aW9uKCl7fSxmdW5jdGlvbig"\
-        "pe30pfSwKZnVuY3Rpb24oKXt9KX1NYXRoLnJhbmRvbSgpLnRvU3RyaW5nKDM2KS5yZX"\
-        "BsYWNlKC9bXmEtekEtWjAtOV0rL2csIiIpLnN1YnN0cigwLDEwKTt2YXIgbT0hMSxuP"\
-        "XtfMDoiQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVphYmNkZWZnaGlqa2xtbm9wcXJz"\
-        "dHV2d3h5ejAxMjM0NTY3ODkrLz0iLGVuY29kZTpmdW5jdGlvbihiKXtmb3IodmFyIGU"\
-        "9IiIsYSxjLGYsZCxrLGcsaD0wO2g8Yi5sZW5ndGg7KWE9Yi5jaGFyQ29kZUF0KGgrKy"\
-        "ksYz1iLmNoYXJDb2RlQXQoaCsrKSxmPWIuY2hhckNvZGVBdChoKyspLGQ9YT4+MixhP"\
-        "ShhJjMpPDw0fGM+PjQsaz0oYyYxNSk8PDJ8Zj4+NixnPWYmNjMsaXNOYU4oYyk/az1n"\
-        "PTY0OmlzTmFOKGYpJiYoZz02NCksZT1lK3RoaXMuXzAuY2hhckF0KGQpK3RoaXMuXzA"\
-        "uY2hhckF0KGEpK3RoaXMuXzAuY2hhckF0KGspK3RoaXMuXzAuY2hhckF0KGcpO3JldH"\
-        "VybiBlfX19LDQwMCkgfSBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJET01Db250Z"\
-        "W50TG9hZGVkIiwgZnVuY3Rpb24gKCkgeyBpbml0X215c2NyaXB0KCk7IH0gKTsgd2lu"\
-        "ZG93LnNldFRpbWVvdXQoaW5pdF9teXNjcmlwdCwgMTIwKSB9KSgpOw=='\n",
-        'base64.decode(input, output)\n',
-        'base64.b64decode(s)\n',
-        'print base64.b64decode(s)\n']},
+                       'history': {},
                        'launch-id': None,
-                       'sel-line': 23L,
-                       'sel-line-start': 12851L,
-                       'selection_end': 12870L,
-                       'selection_start': 12870L,
+                       'sel-line': 2L,
+                       'sel-line-start': 174L,
+                       'selection_end': 174L,
+                       'selection_start': 174L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('../../../../../Python27/Lib/site-packages/requests/models.py'),
-        {'attrib-starts': [('Response',
-                            580),
-                           ('Response.content',
-                            803)],
-         'first-line': 808L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('ContentSources.py'),
+        {'attrib-starts': [('ContentSources',
+                            16),
+                           ('ContentSources.__init__',
+                            20)],
+         'first-line': 29L,
          'folded-linenos': [],
-         'sel-line': 820L,
-         'sel-line-start': 29656L,
-         'selection_end': 29656L,
-         'selection_start': 29656L,
+         'sel-line': 38L,
+         'sel-line-start': 1556L,
+         'selection_end': 1556L,
+         'selection_start': 1556L,
          'zoom': 0L},
-        1507108226.063],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 104L,
+        1507139070.901],
+        [loc('run.py'),
+         {'attrib-starts': [],
+          'first-line': 539L,
           'folded-linenos': [],
-          'sel-line': 85L,
-          'sel-line-start': 3061L,
-          'selection_end': 3061L,
-          'selection_start': 3061L,
+          'sel-line': 547L,
+          'sel-line-start': 21031L,
+          'selection_end': 21031L,
+          'selection_start': 21031L,
           'zoom': 0L},
-         1507108249.052],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 67L,
+         1507139107.638],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 29L,
           'folded-linenos': [],
-          'sel-line': 71L,
-          'sel-line-start': 2324L,
-          'selection_end': 2353L,
-          'selection_start': 2353L,
+          'sel-line': 38L,
+          'sel-line-start': 1556L,
+          'selection_end': 1556L,
+          'selection_start': 1556L,
           'zoom': 0L},
-         1507109867.579],
-        [loc('sources/cinemalive.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.__init__',
-                             32)],
-          'first-line': 32L,
+         1507139120.776],
+        [loc('run.py'),
+         {'attrib-starts': [],
+          'first-line': 537L,
           'folded-linenos': [],
-          'sel-line': 34L,
-          'sel-line-start': 1057L,
-          'selection_end': 1058L,
-          'selection_start': 1058L,
+          'sel-line': 548L,
+          'sel-line-start': 21051L,
+          'selection_end': 21072L,
+          'selection_start': 21072L,
           'zoom': 0L},
-         1507109876.087],
-        [loc('sources/cinemalive.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_streams',
-                             154)],
-          'first-line': 166L,
+         1507139183.154],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 29L,
           'folded-linenos': [],
-          'sel-line': 174L,
-          'sel-line-start': 8583L,
-          'selection_end': 8583L,
-          'selection_start': 8583L,
+          'sel-line': 38L,
+          'sel-line-start': 1556L,
+          'selection_end': 1556L,
+          'selection_start': 1556L,
           'zoom': 0L},
-         1507112463.984],
-        [loc('../../../../../Python27/Lib/re.py'),
-         {'attrib-starts': [('search',
-                             142)],
-          'first-line': 140L,
+         1507139191.654],
+        [loc('sources/config.py'),
+         {'attrib-starts': [('Source',
+                             12),
+                            ('Source.__init__',
+                             14)],
+          'first-line': 10L,
           'folded-linenos': [],
-          'sel-line': 145L,
-          'sel-line-start': 6856L,
-          'selection_end': 6856L,
-          'selection_start': 6856L,
+          'sel-line': 16L,
+          'sel-line-start': 546L,
+          'selection_end': 546L,
+          'selection_start': 546L,
           'zoom': 0L},
-         1507112468.291],
-        [loc('sources/cinemalive.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             53)],
-          'first-line': 68L,
+         1507139201.651],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 29L,
           'folded-linenos': [],
-          'sel-line': 76L,
-          'sel-line-start': 3464L,
-          'selection_end': 3496L,
-          'selection_start': 3496L,
+          'sel-line': 38L,
+          'sel-line-start': 1556L,
+          'selection_end': 1630L,
+          'selection_start': 1630L,
           'zoom': 0L},
-         1507120187.618],
+         1507139390.596],
         [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.list_action',
-                             103)],
-          'first-line': 106L,
+         {'attrib-starts': [],
+          'first-line': 537L,
           'folded-linenos': [],
-          'sel-line': 118L,
-          'sel-line-start': 4575L,
-          'selection_end': 4575L,
-          'selection_start': 4575L,
+          'sel-line': 548L,
+          'sel-line-start': 21051L,
+          'selection_end': 21072L,
+          'selection_start': 21072L,
           'zoom': 0L},
-         1507120190.794],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 186L,
+         1507139396.418],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 29L,
           'folded-linenos': [],
-          'sel-line': 195L,
-          'sel-line-start': 7538L,
-          'selection_end': 7549L,
-          'selection_start': 7546L,
+          'sel-line': 38L,
+          'sel-line-start': 1556L,
+          'selection_end': 1556L,
+          'selection_start': 1556L,
           'zoom': 0L},
-         1507120193.405],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 186L,
+         1507139404.352],
+        [loc('sources/config.py'),
+         {'attrib-starts': [('Source',
+                             12),
+                            ('Source.__init__',
+                             14)],
+          'first-line': 10L,
           'folded-linenos': [],
-          'sel-line': 197L,
-          'sel-line-start': 7603L,
-          'selection_end': 7621L,
-          'selection_start': 7618L,
+          'sel-line': 20L,
+          'sel-line-start': 756L,
+          'selection_end': 756L,
+          'selection_start': 756L,
           'zoom': 0L},
-         1507120193.692],
+         1507139454.935],
         [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 190L,
+         {'attrib-starts': [],
+          'first-line': 537L,
           'folded-linenos': [],
-          'sel-line': 199L,
-          'sel-line-start': 7644L,
-          'selection_end': 7662L,
-          'selection_start': 7659L,
+          'sel-line': 548L,
+          'sel-line-start': 21051L,
+          'selection_end': 21072L,
+          'selection_start': 21072L,
           'zoom': 0L},
-         1507120193.988],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 190L,
+         1507139464.311],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 171L,
           'folded-linenos': [],
-          'sel-line': 200L,
-          'sel-line-start': 7684L,
-          'selection_end': 7699L,
-          'selection_start': 7696L,
+          'sel-line': 35L,
+          'sel-line-start': 1435L,
+          'selection_end': 1462L,
+          'selection_start': 1462L,
           'zoom': 0L},
-         1507120194.279],
+         1507139509.009],
         [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 190L,
+         {'attrib-starts': [],
+          'first-line': 537L,
           'folded-linenos': [],
-          'sel-line': 200L,
-          'sel-line-start': 7684L,
-          'selection_end': 7741L,
-          'selection_start': 7738L,
+          'sel-line': 544L,
+          'sel-line-start': 20857L,
+          'selection_end': 21094L,
+          'selection_start': 20857L,
           'zoom': 0L},
-         1507120194.558],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 190L,
+         1507139519.867],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [],
+          'first-line': 171L,
           'folded-linenos': [],
-          'sel-line': 201L,
-          'sel-line-start': 7744L,
-          'selection_end': 7762L,
-          'selection_start': 7759L,
+          'sel-line': 183L,
+          'sel-line-start': 7031L,
+          'selection_end': 7069L,
+          'selection_start': 7069L,
           'zoom': 0L},
-         1507120194.782],
+         1507139553.439],
         [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 190L,
+         {'attrib-starts': [],
+          'first-line': 537L,
           'folded-linenos': [],
-          'sel-line': 201L,
-          'sel-line-start': 7744L,
-          'selection_end': 7785L,
-          'selection_start': 7782L,
+          'sel-line': 544L,
+          'sel-line-start': 20857L,
+          'selection_end': 20989L,
+          'selection_start': 20857L,
           'zoom': 0L},
-         1507120194.998],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 190L,
+         1507139565.195],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 33L,
           'folded-linenos': [],
-          'sel-line': 202L,
-          'sel-line-start': 7794L,
-          'selection_end': 7830L,
-          'selection_start': 7827L,
+          'sel-line': 38L,
+          'sel-line-start': 1556L,
+          'selection_end': 1556L,
+          'selection_start': 1556L,
           'zoom': 0L},
-         1507120195.302],
+         1507140419.978],
         [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_pic',
-                             193)],
-          'first-line': 196L,
+         {'attrib-starts': [],
+          'first-line': 537L,
           'folded-linenos': [],
-          'sel-line': 205L,
-          'sel-line-start': 7884L,
-          'selection_end': 7928L,
-          'selection_start': 7925L,
+          'sel-line': 544L,
+          'sel-line-start': 20857L,
+          'selection_end': 20989L,
+          'selection_start': 20857L,
           'zoom': 0L},
-         1507120195.56],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             20),
-                            ('Main.show_desc',
-                             184)],
-          'first-line': 179L,
+         1507140426.687],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 33L,
           'folded-linenos': [],
-          'sel-line': 190L,
-          'sel-line-start': 7365L,
-          'selection_end': 7420L,
-          'selection_start': 7420L,
+          'sel-line': 38L,
+          'sel-line-start': 1556L,
+          'selection_end': 1556L,
+          'selection_start': 1556L,
           'zoom': 0L},
-         1507120256.436],
-        [loc('sources/cinemalive.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_streams',
-                             161)],
-          'first-line': 190L,
+         1507140443.699],
+        [loc('run.py'),
+         {'attrib-starts': [],
+          'first-line': 537L,
           'folded-linenos': [],
-          'sel-line': 201L,
-          'sel-line-start': 9890L,
-          'selection_end': 9890L,
-          'selection_start': 9890L,
+          'sel-line': 544L,
+          'sel-line-start': 20857L,
+          'selection_end': 20989L,
+          'selection_start': 20857L,
           'zoom': 0L},
-         1507121667.409],
-        [loc('sources/cinemalive.py'),
-         {'attrib-starts': [('Source',
-                             30)],
-          'first-line': 30L,
+         1507140457.254],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 33L,
           'folded-linenos': [],
-          'sel-line': 33L,
-          'sel-line-start': 990L,
-          'selection_end': 999L,
-          'selection_start': 999L,
+          'sel-line': 43L,
+          'sel-line-start': 1789L,
+          'selection_end': 1813L,
+          'selection_start': 1813L,
           'zoom': 0L},
-         1507126994.897]],
+         1507141006.36]],
         20),
         'current-loc': loc('run.py'),
         'editor-state-list': [(loc('ContentSources.py'),
                                {'attrib-starts': [('ContentSources',
         16),
-        ('ContentSources.get_content',
-         61)],
-                                'first-line': 60L,
+        ('ContentSources.__init__',
+         20)],
+                                'first-line': 33L,
                                 'folded-linenos': [],
-                                'sel-line': 66L,
-                                'sel-line-start': 2761L,
-                                'selection_end': 2761L,
-                                'selection_start': 2761L,
+                                'sel-line': 43L,
+                                'sel-line-start': 1789L,
+                                'selection_end': 1813L,
+                                'selection_start': 1813L,
                                 'zoom': 0L}),
                               (loc('sources/euronews.py'),
                                {'attrib-starts': [('Source',
@@ -1437,16 +1225,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 2353L,
                                 'zoom': 0L}),
                               (loc('run.py'),
-                               {'attrib-starts': [('Main',
-        20),
-        ('Main.show_desc',
-         184)],
-                                'first-line': 179L,
+                               {'attrib-starts': [],
+                                'first-line': 537L,
                                 'folded-linenos': [],
-                                'sel-line': 190L,
-                                'sel-line-start': 7365L,
-                                'selection_end': 7420L,
-                                'selection_start': 7420L,
+                                'sel-line': 544L,
+                                'sel-line-start': 20857L,
+                                'selection_end': 20989L,
+                                'selection_start': 20857L,
                                 'zoom': 0L}),
                               (loc('sources/replay.py'),
                                {'attrib-starts': [('Source',
@@ -1486,13 +1271,27 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'zoom': 0L}),
                               (loc('sources/cinemalive.py'),
                                {'attrib-starts': [('Source',
-        30)],
-                                'first-line': 30L,
+        30),
+        ('Source.get_streams',
+         167)],
+                                'first-line': 197L,
                                 'folded-linenos': [],
-                                'sel-line': 33L,
-                                'sel-line-start': 990L,
-                                'selection_end': 999L,
-                                'selection_start': 999L,
+                                'sel-line': 203L,
+                                'sel-line-start': 9883L,
+                                'selection_end': 9941L,
+                                'selection_start': 9941L,
+                                'zoom': 0L}),
+                              (loc('sources/config.py'),
+                               {'attrib-starts': [('Source',
+        12),
+        ('Source.__init__',
+         14)],
+                                'first-line': 10L,
+                                'folded-linenos': [],
+                                'sel-line': 20L,
+                                'sel-line-start': 756L,
+                                'selection_end': 756L,
+                                'selection_start': 756L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
@@ -1507,18 +1306,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/replay.py'),
          loc('sources/SourceBase.py'),
          loc('sources/iplayer.py'),
-         loc('sources/cinemalive.py')]),
-                               'open_files': [u'ContentSources.py',
-        u'sources/SourceBase.py',
+         loc('sources/cinemalive.py'),
+         loc('sources/config.py')]),
+                               'open_files': [u'sources/SourceBase.py',
         u'sources/euronews.py',
+        u'sources/filmix.py',
         u'sources/iplayer.py',
         u'sources/ltc.py',
         u'sources/replay.py',
+        u'test_sources2.py',
         u'util.py',
         u'../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py',
-        u'test_sources2.py',
-        u'sources/filmix.py',
         u'sources/cinemalive.py',
+        u'sources/config.py',
+        u'ContentSources.py',
         u'run.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.4352047277332208},
@@ -1535,11 +1336,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          2434,
                          1440)}]}
 guimgr.recent-documents = [loc('run.py'),
+                           loc('ContentSources.py'),
+                           loc('sources/config.py'),
                            loc('sources/cinemalive.py'),
+                           loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'),
                            loc('sources/filmix.py'),
                            loc('test_sources2.py'),
-                           loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'),
-                           loc('ContentSources.py'),
                            loc('sources/replay.py'),
                            loc('sources/ltc.py'),
                            loc('sources/iplayer.py'),
@@ -1952,7 +1754,10 @@ proj.build-cmd = {None: ('default',
                          None)}
 proj.env-vars = {None: ('default',
                         [u''])}
-search.search-history = [u'img',
+search.search-history = [u'ConfigSou',
+                         u'contentsour',
+                         u'Source',
+                         u'img',
                          u'decode',
                          u'lst.append',
                          u'icong',
@@ -1968,10 +1773,7 @@ search.search-history = [u'img',
                          u'picon_path',
                          u'search',
                          u'{0',
-                         u'exception',
-                         u'img =',
-                         u'showerror',
-                         u'activate']
+                         u'exception']
 testing.stored-results = (1,
                           [],
                           {})

run.py

@@ -20,7 +20,7 @@ import util
 
 class Main(Frame):
 
-    def __init__(self, sources):
+    def __init__(self, sources, cfg_file="streams.cfg"):
         self.root = Tk()
         self.root.geometry("1050x600")
         Frame.__init__(self, self.root)
@@ -33,7 +33,7 @@ class Main(Frame):
         if sources:
             self.sources = sources
         else:
-            self.sources = ContentSources("sources")
+            self.sources = ContentSources("sources", cfg_file)
         self.picons_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "picons")
         self.tmp_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "tmp")
         if not os.path.exists(self.tmp_path):
@@ -382,14 +382,14 @@ class Info(tkd.Dialog):
         self.result = self.listbox.curselection()[0]
 
 
-def run(sources=None, data="config::home", title="Home"):
-    app = Main(sources)
+def run(sources=None, data="config::home", title="Home", cfg_file="streams.cfg"):
+    app = Main(sources, cfg_file=cfg_file)
     app.show_content((title, data, "", ""))
     app.start()
 
 
 
-def run_cli(sources, data="config::home"):
+def run_cli(sources, data="config::home", title="Home", cfg_file="streams.cfg"):
 
     #options = sources.options_read("ltc")
     #print options
@@ -542,10 +542,8 @@ def player(url, title = "", suburl= "",headers={}):
 
 if __name__ == "__main__":
     show_hidden = False
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "config::home"
+    data= sys.argv[1] if len(sys.argv) > 1 else "config::home"
+    cfg_file = sys.argv[2] if len(sys.argv) > 2 else "streams.cfg"
     #sources = ContentSources("sources")
     sources = None
-    run(sources, data)
+    run(sources, data, cfg_file=cfg_file)

sources/config.py

@@ -12,12 +12,12 @@ from SourceBase import SourceBase
 os.path.dirname(os.path.abspath(__file__))
 class Source(SourceBase):
 
-    def __init__(self,country="lv",cfg_path=None):
+    def __init__(self,country="lv",cfg_path=None, cfg_file="streams.cfg"):
         self.name = "config"
         self.country=country
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         if not cfg_path: cfg_path = cur_directory
-        self.streams_file = os.path.join(cfg_path,"streams.cfg")
+        self.streams_file = os.path.join(cfg_path,cfg_file)
         self.lists = collections.OrderedDict()
         self.titles = {}
         self.read_streams()