0.7t

PlayStream.py

@@ -6,7 +6,7 @@
 # Used fragments of code from enigma2-plugin-tv3play by Taapat (https://github.com/Taapat/enigma2-plugin-tv3play)
 #
 
-__version__ = "0.7s"
+__version__ = "0.7t"
 __id__ = "playstream"
 __title__ = "PlayStream"
 __author__ = "ivars777@gmail.com"
@@ -148,7 +148,10 @@ class MainScreen(Screen):
 
         reload(ContentSources)
         sources_directory = os.path.join(cur_directory, "content", "sources")
-        print "**** streams_file_remote=", config.plugins.playstream.use_streams_file_remote.value
+        print "**** use_streams_file_remote=", config.plugins.playstream.use_streams_file_remote.value
+        print "**** streams_file_remote=", config.plugins.playstream.streams_file_remote.value
+        print "**** streams_file=", config.plugins.playstream.streams_file.value
+        print "**** sources_directory=", sources_directory
         if config.plugins.playstream.use_streams_file_remote.value:
             try:
                 self.sources = ContentSources.ContentSources(sources_directory, config.plugins.playstream.streams_file_remote.value)
@@ -166,6 +169,11 @@ class MainScreen(Screen):
                 print "Local stream file opened"
             except Exception as e:
                 self.msg2(e.message)
+                self.cancel()
+
+        if "config" not in self.sources.plugins:
+            self.msg2("No streams config file")
+            self.cancel()
 
         self.config = self.sources.plugins["config"]
         self.cur_menu = ("Home","config::home","","Sākums") #
@@ -198,7 +206,7 @@ class MainScreen(Screen):
 
     def selection_changed(self):
         current = self["list"].getCurrent()
-        print "[PlayStream] SelectionChanged: current=",current
+        print "[PlayStream] SelectionChanged: current=",current[1]
         if not current: return
         self["cur"].setText(current[3]) if current[3] else self["cur"].setText("")
         if current[2]:
@@ -293,7 +301,7 @@ class MainScreen(Screen):
         if not data:
             return
 
-        elif self.sources.is_video(current[1]):
+        if self.sources.is_video(current[1]):
             if ContentSources.stream_type(current[1]):
                 stream = util.item()
                 stream["url"] = current[1]
@@ -326,6 +334,7 @@ class MainScreen(Screen):
         elif current[1] == "back":
             cur_menu_old = self.cur_menu
             self.cur_menu = self.history.pop()
+            self.update_streams_file()
             new_content = self.sources.get_content(self.cur_menu[1])
             try:
                 index = zip(*new_content)[1].index(cur_menu_old[1])
@@ -343,8 +352,35 @@ class MainScreen(Screen):
                 #current = (current[0],current[1].format(a),current[2],current[3])
                 #self.get_content(current)
             else:
-                self.get_content(current)
+                self.history.append(self.cur_menu)
+                self.update_content(current)
+
+    def cb_input(self,value):
+        if not value:
+            return
+        current = self.current
+        current = (current[0],current[1].format(value),current[2],current[3])
+        self.history.append(self.cur_menu)
+        self.update_content(current)
+
+    def update_content(self,current=None):
+        if current:
+            self.cur_menu = current
+        self.update_streams_file()
+        try:
+            new_content = self.sources.get_content(self.cur_menu[1])
+        except Exception,e:
+            self.cur_menu = self.history.pop()
+            traceback.print_exc()
+            self.session. open(MessageBox, "Error - %s"%str(e) , MessageBox.TYPE_INFO)
+            return
+        self.setTitle2(self.cur_menu[0] + " (" + self.cur_menu[1].split("::")[0]+")")
+        self.show_content(new_content)
 
+    def show_content(self,content,index=0):
+        self["list"].setList(content)
+        self["list"].setIndex(index)
+        self.selection_changed()
 
     def show_info(self):
         self.current = self["list"].getCurrent()
@@ -363,26 +399,6 @@ class MainScreen(Screen):
             nfo = {"movie": {"title": self.current[0], "thumb": self.current[2], "plot": self.current[3]}}
         self.session.open(StreamInfo, nfo)
 
-    def cb_input(self,value):
-        if not value:
-            return
-        current = self.current
-        current = (current[0],current[1].format(value),current[2],current[3])
-        self.get_content(current)
-
-    def get_content(self,current):
-            self.history.append(self.cur_menu)
-            self.cur_menu = current
-            try:
-                new_content = self.sources.get_content(self.cur_menu[1])
-            except Exception,e:
-                self.cur_menu = self.history.pop()
-                traceback.print_exc()
-                self.session. open(MessageBox, "Error - %s"%str(e) , MessageBox.TYPE_INFO)
-                return
-            self.setTitle2(self.cur_menu[0] + " (" + self.cur_menu[1].split("::")[0]+")")
-            self.show_content(new_content)
-
     def back(self):
         if self.history:
             self["list"].setIndex(0)
@@ -390,10 +406,11 @@ class MainScreen(Screen):
         else:
             self.cancel()
 
-    def show_content(self,content,index=0):
-        self["list"].setList(content)
-        self["list"].setIndex(index)
-        self.selection_changed()
+    def update_streams_file(self):
+        if config.plugins.playstream.use_streams_file_remote.value:
+            self.config.set_streams_file(config.plugins.playstream.streams_file_remote.value)
+        else:
+            self.config.set_streams_file(config.plugins.playstream.streams_file.value)
 
     def cancel(self):
         print "Exiting PlayStream"
@@ -471,13 +488,14 @@ class MainScreen(Screen):
             #print lst
             self.config.del_item(lst,self.index)
             self.config.write_streams()
+            self.update_content()
             txt = "'%s' deleted from favourite stream list '%s'"%(self.current[0],lst)
             self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)
 
         elif answer[1] == "move":
             lst = self.cur_menu[1].replace("config::","")
             items = self.config.get_list_items(lst)
-            self.session.openWithCallback(self.cb_move, ChoiceBox, title="Move berore selected item",list = items)
+            self.session.openWithCallback(self.cb_move, ChoiceBox, title="Move before selected item",list = items)
             #self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)
             #self.config.write_streams()
             #txt = "'%s' deleted from favourite stream list '%s'"%(self.current[0],lst)
@@ -513,8 +531,10 @@ class MainScreen(Screen):
             #download_dir = config.plugins.playstream.download_dir.value
         title = re.sub("\[.+?\]","", util.make_fname(current[0])).strip()
         download_dir2 = os.path.join(download_dir, title)
+
         if not self.sources.is_video(current[1]):
             #self.msg("Can not download listst (yet) - %s"%(current[1]))
+            self.update_streams_file()
             n = 0
             for current2 in self.sources.get_content(current[1]):
                 if self.sources.is_video(current2[1]):
@@ -680,7 +700,6 @@ class MainScreen(Screen):
             self.msg("Unkown stream type - %s!"%stream_type)
             return False
 
-
     def cb_rename(self,value):
         if not value:
             return
@@ -692,8 +711,9 @@ class MainScreen(Screen):
         item2 = tuple(item2)
         self.config.replace_item(lst,item2,pos)
         self.config.write_streams()
-        txt = "'%s' renamed to '%s'"%(self.current[0],value)
-        self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)
+        self.update_content()
+        #txt = "'%s' renamed to '%s'"%(self.current[0],value)
+        #self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)
 
     def cb_favorites(self,answer):
         print "cb_favorites",answer,self.current
@@ -708,15 +728,21 @@ class MainScreen(Screen):
 
     def cb_move(self,answer):
         print "cb_move",answer,self.current
-        self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)
-        return
-
-        #if not answer:
-        #    return
-        #value = answer[1]
-        #self.config.add_item(value,self.current)
-        #self.config.write_streams()
-        #txt = "'%s' added to favourite stream list '%s'"%(self.current[0],value)
+        if not answer:
+            return
+        answer[1]
+        lst = self.cur_menu[1].replace("config::","")
+        pos = self.index
+        items = self.config.get_list_items(lst)
+        for pos2, it in enumerate(items):
+            if it[1] == answer[1]:
+                break
+        else:
+            pos2 = None
+        self.config.move_item(lst, pos, pos2)
+        self.config.write_streams()
+        self.update_content()
+        #txt = "Item moved from position %s to %s'"%(pos,pos2)
         #self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=3)
         #self.session.openWithCallback(self.callMyMsg, MessageBox, _("Do you want to exit the plugin?"), MessageBox.TYPE_INFO)
 
@@ -1027,7 +1053,9 @@ class PSPlayer(MoviePlayer):
 #####################################################################################################################
 class ConfigScreen(ConfigListScreen,Screen):
 
-    def __init__(self, session, args = 0):
+    def __init__(self, session, main):
+        #print main
+        self.main = main
         self.session = session
         #self.setup_title = "Options"
         Screen.__init__(self, session)
@@ -1099,6 +1127,7 @@ class ConfigScreen(ConfigListScreen,Screen):
         print "saving"
         self.saveAll()
         self.close(True,self.session)
+        self.main.update_content()
 
     def cancel(self):
         #print "cancel"

PlayStream.wpr

@@ -76,7 +76,11 @@ proj.launch-config = {loc('../../$pylib/main6.py'): ('project',
         (u'http://walterebert.com/playground/video/hls/ts/480x270.m3u8',
          ''))}
 [user attributes]
-debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
+debug.breakpoints = {loc('content/sources/config.py'): {171L: (0,
+        None,
+        1,
+        0)},
+                     loc('gstreamer/player-minimal.py'): {12: (0,
         None,
         1,
         0)},
@@ -5121,8 +5125,8 @@ debug.var-col-widths = [0.3789319678127286,
 edit.bookmarks = {u'InfoScreen': (loc('PlayStream.py'),
                                   {'attrib-starts': [('InfoScreen',
         1100)],
-                                   'first-line': 696L,
-                                   'sel-line': 1172L})}
+                                   'first-line': 725L,
+                                   'sel-line': 1201L})}
 edit.file-encoding = {loc('streams.cfg'): 'utf_8'}
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                             'windows': [{'name': 'CLLIF0zyp30ULG6MKhIRp1Beg6'\
@@ -5132,9 +5136,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'view': {'area': 'tall',
                  'constraint': None,
                  'current_pages': [1,
-                                   1],
+                                   0],
                  'full-screen': False,
-                 'notebook_display': 'tabs only',
+                 'notebook_display': 'normal',
                  'notebook_percent': 0.23781998348472333,
                  'override_title': None,
                  'pagelist': [('snippets',
@@ -5732,6 +5736,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'Modules': True,
         u'Public': True,
         u'Variables': False}}),
+                              ('refactoring',
+                               'tall',
+                               0,
+                               {}),
                               ('source-assistant',
                                'tall',
                                2,
@@ -5747,7 +5755,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
         'current_pages': [1,
-                          3],
+                          0],
         'notebook_display': 'normal',
         'notebook_percent': 0.42105263157894735,
         'override_title': None,
@@ -5797,7 +5805,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'cb_download_dir',
                                        'fReverse': False,
-                                       'fSearchText': u'streams_file_remote',
+                                       'fSearchText': u'print main',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5910,267 +5918,268 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('PlayStream.py'),
         {'attrib-starts': [('MainScreen',
                             93),
-                           ('MainScreen.cb_item_menu',
-                            441)],
-         'first-line': 485L,
-         'folded-linenos': [334L],
-         'sel-line': 474L,
-         'sel-line-start': 20942L,
-         'selection_end': 20949L,
-         'selection_start': 20949L,
+                           ('MainScreen.layout_finished',
+                            133)],
+         'first-line': 149L,
+         'folded-linenos': [303L],
+         'sel-line': 159L,
+         'sel-line-start': 7486L,
+         'selection_end': 7506L,
+         'selection_start': 7506L,
          'zoom': 0L},
-        1520729521.3],
+        1520765029.276],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('MainScreen',
-                             93),
-                            ('MainScreen.download_prepare',
-                             504)],
-          'first-line': 492L,
-          'folded-linenos': [334L],
-          'sel-line': 508L,
-          'sel-line-start': 22774L,
-          'selection_end': 22774L,
-          'selection_start': 22774L,
+         {'attrib-starts': [('ConfigScreen',
+                             1053),
+                            ('ConfigScreen.select_tmp_dir',
+                             1115)],
+          'first-line': 1094L,
+          'folded-linenos': [303L],
+          'sel-line': 1120L,
+          'sel-line-start': 48248L,
+          'selection_end': 48279L,
+          'selection_start': 48279L,
           'zoom': 0L},
-         1520729680.381],
+         1520765145.141],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('MainScreen',
-                             93),
-                            ('MainScreen.cb_move',
-                             704)],
-          'first-line': 701L,
-          'folded-linenos': [334L],
-          'sel-line': 712L,
-          'sel-line-start': 31243L,
-          'selection_end': 31253L,
-          'selection_start': 31253L,
+         {'attrib-starts': [('ConfigScreen',
+                             1053)],
+          'first-line': 1044L,
+          'folded-linenos': [303L],
+          'sel-line': 1053L,
+          'sel-line-start': 44495L,
+          'selection_end': 44513L,
+          'selection_start': 44501L,
           'zoom': 0L},
-         1520730166.753],
+         1520765193.281],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.layout_finished',
-                             133)],
-          'first-line': 144L,
-          'folded-linenos': [334L],
-          'sel-line': 150L,
-          'sel-line-start': 6838L,
-          'selection_end': 6849L,
-          'selection_start': 6849L,
+                            ('MainScreen.config_screen',
+                             748)],
+          'first-line': 744L,
+          'folded-linenos': [303L],
+          'sel-line': 749L,
+          'sel-line-start': 32971L,
+          'selection_end': 33010L,
+          'selection_start': 33010L,
           'zoom': 0L},
-         1520730504.623],
+         1520765228.96],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('MainScreen',
-                             93),
-                            ('MainScreen.layout_finished',
-                             133)],
-          'first-line': 144L,
-          'folded-linenos': [334L],
-          'sel-line': 156L,
-          'sel-line-start': 7225L,
-          'selection_end': 7253L,
-          'selection_start': 7245L,
+         {'attrib-starts': [('ConfigScreen',
+                             1053),
+                            ('ConfigScreen.__init__',
+                             1055)],
+          'first-line': 1041L,
+          'folded-linenos': [303L],
+          'sel-line': 1056L,
+          'sel-line-start': 44580L,
+          'selection_end': 44598L,
+          'selection_start': 44598L,
           'zoom': 0L},
-         1520730506.911],
+         1520765380.458],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('MainScreen',
-                             93),
-                            ('MainScreen.layout_finished',
-                             133)],
-          'first-line': 149L,
-          'folded-linenos': [334L],
-          'sel-line': 158L,
-          'sel-line-start': 7352L,
-          'selection_end': 7380L,
-          'selection_start': 7372L,
+         {'attrib-starts': [('CustomContextFactory',
+                             83),
+                            ('CustomContextFactory.getContext',
+                             86)],
+          'first-line': 84L,
+          'folded-linenos': [303L],
+          'sel-line': 88L,
+          'sel-line-start': 4232L,
+          'selection_end': 4254L,
+          'selection_start': 4254L,
           'zoom': 0L},
-         1520730508.241],
+         1520765386.18],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.layout_finished',
-                             133)],
-          'first-line': 154L,
-          'folded-linenos': [334L],
-          'sel-line': 163L,
-          'sel-line-start': 7581L,
-          'selection_end': 7605L,
-          'selection_start': 7597L,
+                            ('MainScreen.ok',
+                             293)],
+          'first-line': 295L,
+          'folded-linenos': [303L],
+          'sel-line': 336L,
+          'sel-line-start': 15150L,
+          'selection_end': 15186L,
+          'selection_start': 15167L,
           'zoom': 0L},
-         1520730508.806],
+         1520765398.104],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.ok',
-                             281)],
-          'first-line': 303L,
-          'folded-linenos': [334L],
-          'sel-line': 315L,
-          'sel-line-start': 14155L,
-          'selection_end': 14183L,
-          'selection_start': 14175L,
+                            ('MainScreen.update_content',
+                             365)],
+          'first-line': 356L,
+          'folded-linenos': [303L],
+          'sel-line': 368L,
+          'sel-line-start': 16403L,
+          'selection_end': 16435L,
+          'selection_start': 16416L,
           'zoom': 0L},
-         1520730509.756],
+         1520765403.927],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.ok',
-                             281)],
-          'first-line': 309L,
-          'folded-linenos': [334L],
-          'sel-line': 318L,
-          'sel-line-start': 14267L,
-          'selection_end': 14291L,
-          'selection_start': 14283L,
+                            ('MainScreen.update_streams_file',
+                             408)],
+          'first-line': 396L,
+          'folded-linenos': [303L],
+          'sel-line': 408L,
+          'sel-line-start': 17884L,
+          'selection_end': 17911L,
+          'selection_start': 17892L,
           'zoom': 0L},
-         1520730510.98],
+         1520765419.863],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
                             ('MainScreen.download_prepare',
-                             504)],
-          'first-line': 500L,
-          'folded-linenos': [334L],
-          'sel-line': 512L,
-          'sel-line-start': 23013L,
-          'selection_end': 23034L,
-          'selection_start': 23026L,
+                             526)],
+          'first-line': 524L,
+          'folded-linenos': [303L],
+          'sel-line': 536L,
+          'sel-line-start': 24207L,
+          'selection_end': 24243L,
+          'selection_start': 24224L,
           'zoom': 0L},
-         1520730513.813],
+         1520765420.385],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.download_prepare',
-                             504)],
-          'first-line': 507L,
-          'folded-linenos': [334L],
-          'sel-line': 519L,
-          'sel-line-start': 23336L,
-          'selection_end': 23360L,
-          'selection_start': 23352L,
+                            ('MainScreen.ok',
+                             293)],
+          'first-line': 302L,
+          'folded-linenos': [303L],
+          'sel-line': 336L,
+          'sel-line-start': 15150L,
+          'selection_end': 15186L,
+          'selection_start': 15167L,
           'zoom': 0L},
-         1520730517.47],
+         1520765422.267],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.download_prepare',
-                             504)],
-          'first-line': 512L,
-          'folded-linenos': [334L],
-          'sel-line': 521L,
-          'sel-line-start': 23433L,
-          'selection_end': 23457L,
-          'selection_start': 23449L,
+                            ('MainScreen.update_content',
+                             365)],
+          'first-line': 356L,
+          'folded-linenos': [303L],
+          'sel-line': 368L,
+          'sel-line-start': 16403L,
+          'selection_end': 16435L,
+          'selection_start': 16416L,
           'zoom': 0L},
-         1520730518.156],
+         1520765423.184],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.download_prepare',
-                             504)],
-          'first-line': 517L,
-          'folded-linenos': [334L],
-          'sel-line': 526L,
-          'sel-line-start': 23643L,
-          'selection_end': 23667L,
-          'selection_start': 23659L,
+                            ('MainScreen.back',
+                             401)],
+          'first-line': 396L,
+          'folded-linenos': [303L],
+          'sel-line': 401L,
+          'sel-line-start': 17739L,
+          'selection_end': 17758L,
+          'selection_start': 17758L,
           'zoom': 0L},
-         1520730523.631],
+         1520765726.449],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.video_download_stop',
-                             730)],
-          'first-line': 720L,
-          'folded-linenos': [334L],
-          'sel-line': 732L,
-          'sel-line-start': 32127L,
-          'selection_end': 32144L,
-          'selection_start': 32135L,
+                            ('MainScreen.cancel',
+                             414)],
+          'first-line': 403L,
+          'folded-linenos': [303L],
+          'sel-line': 415L,
+          'sel-line-start': 18205L,
+          'selection_end': 18224L,
+          'selection_start': 18222L,
           'zoom': 0L},
-         1520730526.858],
+         1520765727.176],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.layout_finished',
-                             133)],
-          'first-line': 151L,
-          'folded-linenos': [334L],
-          'sel-line': 157L,
-          'sel-line-start': 7314L,
-          'selection_end': 7329L,
-          'selection_start': 7329L,
+                            ('MainScreen.cb_move',
+                             728)],
+          'first-line': 725L,
+          'folded-linenos': [303L],
+          'sel-line': 736L,
+          'sel-line-start': 32432L,
+          'selection_end': 32452L,
+          'selection_start': 32452L,
           'zoom': 0L},
-         1520730990.901],
+         1520765751.411],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('ConfigScreen',
-                             1023),
-                            ('ConfigScreen.__init__',
-                             1025)],
-          'first-line': 1026L,
-          'folded-linenos': [334L],
-          'sel-line': 1038L,
-          'sel-line-start': 44109L,
-          'selection_end': 44218L,
-          'selection_start': 44199L,
+         {'attrib-starts': [('MainScreen',
+                             93),
+                            ('MainScreen.options_screen',
+                             751)],
+          'first-line': 742L,
+          'folded-linenos': [303L],
+          'sel-line': 754L,
+          'sel-line-start': 33152L,
+          'selection_end': 33164L,
+          'selection_start': 33160L,
           'zoom': 0L},
-         1520730995.581],
+         1520765753.387],
         [loc('PlayStream.py'),
          {'attrib-starts': [('ConfigScreen',
-                             1023),
-                            ('ConfigScreen.__init__',
-                             1025)],
-          'first-line': 1030L,
-          'folded-linenos': [334L],
-          'sel-line': 1039L,
-          'sel-line-start': 44221L,
-          'selection_end': 44339L,
-          'selection_start': 44320L,
-          'zoom': 0L},
-         1520730997.006],
-        [loc('PlayStream.py'),
-         {'attrib-starts': [],
-          'first-line': 75L,
-          'folded-linenos': [334L],
-          'sel-line': 80L,
-          'sel-line-start': 3841L,
-          'selection_end': 3886L,
-          'selection_start': 3867L,
+                             1053),
+                            ('ConfigScreen.select_tmp_dir',
+                             1116)],
+          'first-line': 1116L,
+          'folded-linenos': [303L],
+          'sel-line': 1122L,
+          'sel-line-start': 48315L,
+          'selection_end': 48317L,
+          'selection_start': 48317L,
           'zoom': 0L},
-         1520730997.75],
+         1520765917.643],
         [loc('PlayStream.py'),
-         {'attrib-starts': [],
-          'first-line': 75L,
-          'folded-linenos': [334L],
-          'sel-line': 81L,
-          'sel-line-start': 3952L,
-          'selection_end': 4001L,
-          'selection_start': 3982L,
+         {'attrib-starts': [('MainScreen',
+                             93),
+                            ('MainScreen.start_decode',
+                             245)],
+          'first-line': 239L,
+          'folded-linenos': [303L],
+          'sel-line': 248L,
+          'sel-line-start': 11149L,
+          'selection_end': 11149L,
+          'selection_start': 11149L,
           'zoom': 0L},
-         1520730998.238],
+         1520765929.925],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
                              93),
-                            ('MainScreen.layout_finished',
-                             133)],
-          'first-line': 138L,
-          'folded-linenos': [334L],
-          'sel-line': 150L,
-          'sel-line-start': 6838L,
-          'selection_end': 6898L,
-          'selection_start': 6879L,
+                            ('MainScreen.selection_changed',
+                             206)],
+          'first-line': 199L,
+          'folded-linenos': [303L],
+          'sel-line': 208L,
+          'sel-line-start': 9605L,
+          'selection_end': 9670L,
+          'selection_start': 9670L,
+          'zoom': 0L},
+         1520766083.095],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [],
+          'first-line': 0L,
+          'folded-linenos': [303L],
+          'sel-line': 8L,
+          'sel-line-start': 401L,
+          'selection_end': 420L,
+          'selection_start': 420L,
           'zoom': 0L},
-         1520730999.326]],
+         1520767034.408]],
         20),
-        'current-loc': loc('PlayStream.py'),
+        'current-loc': loc('changelog.md'),
         'editor-state-list': [(loc('changelog.md'),
                                {'attrib-starts': [],
                                 'first-line': 0L,
                                 'folded-linenos': [],
-                                'sel-line': 2L,
-                                'sel-line-start': 69L,
-                                'selection_end': 69L,
-                                'selection_start': 69L,
+                                'sel-line': 1L,
+                                'sel-line-start': 23L,
+                                'selection_end': 66L,
+                                'selection_start': 66L,
                                 'zoom': 0L}),
                               (loc('plugin.py'),
                                {'attrib-starts': [],
@@ -6182,16 +6191,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 203L,
                                 'zoom': 0L}),
                               (loc('PlayStream.py'),
-                               {'attrib-starts': [('MainScreen',
-        93),
-        ('MainScreen.layout_finished',
-         133)],
-                                'first-line': 156L,
-                                'folded-linenos': [338L],
-                                'sel-line': 151L,
-                                'sel-line-start': 6937L,
-                                'selection_end': 6972L,
-                                'selection_start': 6972L,
+                               {'attrib-starts': [],
+                                'first-line': 0L,
+                                'folded-linenos': [303L],
+                                'sel-line': 8L,
+                                'sel-line-start': 401L,
+                                'selection_end': 420L,
+                                'selection_start': 420L,
                                 'zoom': 0L}),
                               (loc('VideoDownload.py'),
                                {'attrib-starts': [('VideoDownloadList',
@@ -6213,49 +6219,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 1892L,
                                 'selection_start': 1892L,
                                 'zoom': 0L}),
-                              (loc('../python/skin.py'),
-                               {'attrib-starts': [('collectAttributes',
-        247)],
-                                'first-line': 257L,
-                                'folded-linenos': [],
-                                'sel-line': 255L,
-                                'sel-line-start': 7940L,
-                                'selection_end': 7951L,
-                                'selection_start': 7944L,
-                                'zoom': 0L}),
-                              (loc('test_download.py'),
-                               {'attrib-starts': [],
-                                'first-line': 9L,
-                                'folded-linenos': [],
-                                'sel-line': 21L,
-                                'sel-line-start': 588L,
-                                'selection_end': 641L,
-                                'selection_start': 621L,
-                                'zoom': 0L}),
-                              (loc('../python/Tools/BoundFunction.py'),
-                               {'attrib-starts': [('boundFunction',
-        0),
-        ('boundFunction.__call__',
-         5)],
-                                'first-line': 0L,
-                                'folded-linenos': [],
-                                'sel-line': 6L,
-                                'sel-line-start': 161L,
-                                'selection_end': 186L,
-                                'selection_start': 180L,
-                                'zoom': 0L}),
-                              (loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'),
-                               {'attrib-starts': [('_tolerateErrors',
-        1079),
-        ('_tolerateErrors.infoCallback',
-         1099)],
-                                'first-line': 1096L,
-                                'folded-linenos': [],
-                                'sel-line': 1105L,
-                                'sel-line-start': 35215L,
-                                'selection_end': 35250L,
-                                'selection_start': 35238L,
-                                'zoom': 0L}),
                               (loc('imake.bat'),
                                {'attrib-starts': [],
                                 'first-line': 102L,
@@ -6265,44 +6228,26 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 2632L,
                                 'selection_start': 2632L,
                                 'zoom': 0L}),
-                              (loc('content/sources/cinemalive.py'),
-                               {'attrib-starts': [('Source',
-        29),
-        ('Source.__init__',
-         31)],
-                                'first-line': 17L,
-                                'folded-linenos': [],
-                                'sel-line': 33L,
-                                'sel-line-start': 1056L,
-                                'selection_end': 1088L,
-                                'selection_start': 1088L,
-                                'zoom': 0L}),
-                              (loc('content/sources/SourceBase.py'),
-                               {'attrib-starts': [],
-                                'first-line': 12L,
-                                'folded-linenos': [],
-                                'sel-line': 24L,
-                                'sel-line-start': 732L,
-                                'selection_end': 732L,
-                                'selection_start': 732L,
-                                'zoom': 0L}),
-                              (loc('content/resolvers/cloudsany.py'),
+                              (loc('content/sources/config.py'),
                                {'attrib-starts': [],
-                                'first-line': 5L,
+                                'first-line': 158L,
                                 'folded-linenos': [],
-                                'sel-line': 12L,
-                                'sel-line-start': 240L,
-                                'selection_end': 408L,
-                                'selection_start': 240L,
+                                'sel-line': 164L,
+                                'sel-line-start': 5771L,
+                                'selection_end': 5797L,
+                                'selection_start': 5797L,
                                 'zoom': 0L}),
-                              (loc('skin.xml'),
-                               {'attrib-starts': [],
-                                'first-line': 6L,
+                              (loc('content/ContentSources.py'),
+                               {'attrib-starts': [('ContentSources',
+        16),
+        ('ContentSources.__init__',
+         20)],
+                                'first-line': 33L,
                                 'folded-linenos': [],
-                                'sel-line': 18L,
-                                'sel-line-start': 1610L,
-                                'selection_end': 1610L,
-                                'selection_start': 1610L,
+                                'sel-line': 46L,
+                                'sel-line-start': 1885L,
+                                'selection_end': 1925L,
+                                'selection_start': 1925L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
@@ -6311,29 +6256,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('PlayStream.py'),
          loc('VideoDownload.py'),
          loc('../python/enigma.py'),
-         loc('../python/skin.py'),
-         loc('test_download.py'),
-         loc('../python/Tools/BoundFunction.py'),
-         loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'),
          loc('imake.bat'),
-         loc('content/sources/cinemalive.py'),
-         loc('content/sources/SourceBase.py'),
-         loc('content/resolvers/cloudsany.py'),
-         loc('skin.xml')]),
+         loc('content/sources/config.py'),
+         loc('content/ContentSources.py')]),
                                'open_files': [u'VideoDownload.py',
-        u'content/resolvers/cloudsany.py',
-        u'content/sources/SourceBase.py',
-        u'content/sources/cinemalive.py',
         u'imake.bat',
-        u'skin.xml',
-        u'test_download.py',
-        u'../python/Tools/BoundFunction.py',
         u'../python/enigma.py',
-        u'../python/skin.py',
-        u'../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py',
-        u'changelog.md',
         u'plugin.py',
-        u'PlayStream.py']},
+        u'content/ContentSources.py',
+        u'content/sources/config.py',
+        u'PlayStream.py',
+        u'changelog.md']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.4733405875952122},
         'splits': 2,
@@ -6348,18 +6281,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          1880,
                          1100)}]}
-guimgr.recent-documents = [loc('PlayStream.py'),
+guimgr.recent-documents = [loc('changelog.md'),
+                           loc('PlayStream.py'),
+                           loc('content/sources/config.py'),
+                           loc('content/ContentSources.py'),
                            loc('plugin.py'),
-                           loc('changelog.md'),
-                           loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'),
-                           loc('skin.xml'),
-                           loc('content/sources/cinemalive.py'),
-                           loc('content/sources/SourceBase.py'),
                            loc('VideoDownload.py'),
                            loc('imake.bat'),
-                           loc('test_download.py'),
-                           loc('../python/Tools/BoundFunction.py'),
-                           loc('../python/skin.py'),
                            loc('../python/enigma.py')]
 guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'rse_arguments',
@@ -6449,6 +6377,35 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'sel-line-start': 7870,
         'selection_end': 7881,
         'selection_start': 7875},
+                       loc('content/resolvers/cloudsany.py'): {'attrib-start'\
+        's': [],
+        'first-line': 5L,
+        'folded-linenos': [],
+        'sel-line': 12L,
+        'sel-line-start': 240L,
+        'selection_end': 408L,
+        'selection_start': 240L,
+        'zoom': 0L},
+                       loc('content/sources/SourceBase.py'): {'attrib-starts': [],
+        'first-line': 12L,
+        'folded-linenos': [],
+        'sel-line': 24L,
+        'sel-line-start': 732L,
+        'selection_end': 732L,
+        'selection_start': 732L,
+        'zoom': 0L},
+                       loc('content/sources/cinemalive.py'): {'attrib-starts': [('S'\
+        'ource',
+        29),
+        ('Source.__init__',
+         31)],
+        'first-line': 17L,
+        'folded-linenos': [],
+        'sel-line': 33L,
+        'sel-line-start': 1056L,
+        'selection_end': 1088L,
+        'selection_start': 1088L,
+        'zoom': 0L},
                        loc('enigma2/skin.xml'): {'attrib-starts': [],
         'first-line': 0L,
         'folded-linenos': [],
@@ -6812,6 +6769,14 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'sel-line-start': 0,
         'selection_end': 0,
         'selection_start': 0},
+                       loc('skin.xml'): {'attrib-starts': [],
+        'first-line': 6L,
+        'folded-linenos': [],
+        'sel-line': 18L,
+        'sel-line-start': 1610L,
+        'selection_end': 1610L,
+        'selection_start': 1610L,
+        'zoom': 0L},
                        loc('sniplets.py'): {'attrib-starts': [],
         'first-line': 0L,
         'folded-linenos': [],
@@ -7185,6 +7150,14 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'sel-line-start': 27L,
         'selection_end': 59L,
         'selection_start': 27L,
+        'zoom': 0L},
+                       loc('test_download.py'): {'attrib-starts': [],
+        'first-line': 9L,
+        'folded-linenos': [],
+        'sel-line': 21L,
+        'sel-line-start': 588L,
+        'selection_end': 641L,
+        'selection_start': 621L,
         'zoom': 0L},
                        loc('test_m3u8.py'): {'attrib-starts': [],
         'first-line': 0,
@@ -7285,6 +7258,18 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'sel-line-start': 0L,
         'selection_end': 0L,
         'selection_start': 0L,
+        'zoom': 0L},
+                       loc('../python/Tools/BoundFunction.py'): {'attrib-sta'\
+        'rts': [('boundFunction',
+                 0),
+                ('boundFunction.__call__',
+                 5)],
+        'first-line': 0L,
+        'folded-linenos': [],
+        'sel-line': 6L,
+        'sel-line-start': 161L,
+        'selection_end': 186L,
+        'selection_start': 180L,
         'zoom': 0L},
                        loc('../python/Tools/Directories.py'): {'attrib-start'\
         's': [('resolveFilename',
@@ -7305,6 +7290,16 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'sel-line-start': 165L,
         'selection_end': 172L,
         'selection_start': 172L,
+        'zoom': 0L},
+                       loc('../python/skin.py'): {'attrib-starts': [('collec'\
+        'tAttributes',
+        247)],
+        'first-line': 257L,
+        'folded-linenos': [],
+        'sel-line': 255L,
+        'sel-line-start': 7940L,
+        'selection_end': 7951L,
+        'selection_start': 7944L,
         'zoom': 0L},
                        loc('../../../../Python27/Lib/BaseHTTPServer.py'): {'a'\
         'ttrib-starts': [('BaseHTTPRequestHandler',
@@ -7396,6 +7391,18 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'sel-line-start': 2762,
         'selection_end': 2762,
         'selection_start': 2762},
+                       loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'): {'a'\
+        'ttrib-starts': [('_tolerateErrors',
+                          1079),
+                         ('_tolerateErrors.infoCallback',
+                          1099)],
+        'first-line': 1096L,
+        'folded-linenos': [],
+        'sel-line': 1105L,
+        'sel-line-start': 35215L,
+        'selection_end': 35250L,
+        'selection_start': 35238L,
+        'zoom': 0L},
                        loc('../../../../Python27/Lib/site-packages/twisted/internet/base.py'): {'a'\
         'ttrib-starts': [('_SignalReactorMixin',
                           1171),
@@ -7572,26 +7579,26 @@ search.replace-history = [u'cb_download_dir',
                           u'filmix.me',
                           u'self',
                           u'current']
-search.search-history = [u'streams_file_remote',
-                         u'self.msg2',
-                         u'self.msg',
-                         u'delete',
-                         u'move',
-                         u'add',
-                         u'"add"',
-                         u'streams_file',
-                         u'Contents',
-                         u'streams_fi',
-                         u'msg',
-                         u'tmp_dir',
+search.search-history = [u'update_streams_file',
+                         u'ConfigScreen',
+                         u'update_content',
+                         u'ConfigListScreen',
+                         u'cb_move',
+                         u'show_content',
+                         u'cb_input',
+                         u'self.get_conte',
+                         u'sources.get_co',
+                         u'pass',
                          u'self.config',
-                         u'sources',
-                         u'decoded',
-                         u'history',
-                         u'exit',
-                         u'warning',
-                         u'warn',
-                         u'war']
+                         u'config',
+                         u'get_con',
+                         u'use_',
+                         u'get_conten',
+                         u'get_conte',
+                         u'self.cfg_file',
+                         u'streams_file_remote',
+                         u'self.msg2',
+                         u'self.msg']
 testing.stored-results = (1,
                           [],
                           {})

changelog.md

@@ -1,5 +1,7 @@
-**0.7s** (10.03.2018)
+**0.7t** (10.03.2018)
 - [change] Delete un Move favorītos stradā
+- [change] Config avotā uzlabota streams_file manipulācija (var dinamiski mainīt)
+- [change] Nedaudz piefrizēts kods u.c.
 
 **0.7r** (10.03.2018)
 - [change] uzlabota ltc informācija