0.7s

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.7o"
+__version__ = "0.7s"
 __id__ = "playstream"
 __title__ = "PlayStream"
 __author__ = "ivars777@gmail.com"
@@ -77,7 +77,9 @@ config.plugins.playstream.overwrite_download = ConfigYesNo(default = False)
 #config.plugins.playstream.size = ConfigSelection({"400x240":"400x240","220x132":"220x132","100x60":"100x60"}, default="220x132")
 config.plugins.playstream.clear_tmp = ConfigYesNo(default = True)
 config.plugins.playstream.check_update = ConfigYesNo(default = True)
-
+config.plugins.playstream.streams_file = ConfigText(default="streams.cfg")
+config.plugins.playstream.streams_file_remote = ConfigText(default="ftp://user:password@host/hdd/streams.cfg")
+config.plugins.playstream.use_streams_file_remote = ConfigYesNo(default = False)
 
 class CustomContextFactory(ClientContextFactory):
     def __init__(self, hostname = None):
@@ -145,7 +147,26 @@ class MainScreen(Screen):
         self.history = []
 
         reload(ContentSources)
-        self.sources = ContentSources.ContentSources(os.path.join(cur_directory, "content", "sources"))
+        sources_directory = os.path.join(cur_directory, "content", "sources")
+        print "**** streams_file_remote=", config.plugins.playstream.use_streams_file_remote.value
+        if config.plugins.playstream.use_streams_file_remote.value:
+            try:
+                self.sources = ContentSources.ContentSources(sources_directory, config.plugins.playstream.streams_file_remote.value)
+                print "Remote stream file opened"
+            except Exception as e:
+                try:
+                    self.sources = ContentSources.ContentSources(sources_directory, config.plugins.playstream.streams_file.value)
+                    print "Streams_file fallback"
+                    self.msg2("Remote streams file is not available, fallback to local")
+                except Exception as e:
+                    self.msg2(e.message)
+        else:
+            try:
+                self.sources = ContentSources.ContentSources(sources_directory, config.plugins.playstream.streams_file.value)
+                print "Local stream file opened"
+            except Exception as e:
+                self.msg2(e.message)
+
         self.config = self.sources.plugins["config"]
         self.cur_menu = ("Home","config::home","","Sākums") #
         self.content = self.sources.get_content(self.cur_menu[1])
@@ -395,9 +416,18 @@ class MainScreen(Screen):
             ("Aditional information","info","Display additional information about item"),
             ("Add to bouquet","bouquet","Add current item to Enigma2 bouquet"),
             ("Add to favorites","favorites","Add current item to PlayStrem favorites"),
+        ]
+        if "config::" in self.cur_menu[1]:
+            lst.extend([
+            ("Rename item","rename","Rename list item"),
+            ("Move item","move","Move list item"),
+            ("Delete item","delete","Delete list item"),
+            ("Add submenu","add_list","Add submenu before selected item"),
+            ])
+        lst.extend([
             ("Show active downloads","download_list","Show active downloads list"),
             ("Set download folder","download_folder","Set download folder")
-        ]
+        ])
         if self.sources.is_video(self.current[1]):
             lst.extend([
             ("Download video to default folder","download","Download video to default folder"),
@@ -410,13 +440,6 @@ class MainScreen(Screen):
             ("Download list to default folder","download","Download videos in list (if any)"),
             ("Download list, ask folder","download2","Download videos in list (if any), ask download folder"),
             ])
-        if "config::" in self.cur_menu[1]:
-            lst.extend([
-            ("Rename item","rename","Rename list item"),
-            ("Move item","move","Move list item"),
-            ("Delete item","delete","Delete list item"),
-            ("Add submenu","add_list","Add submenu before selected item"),
-            ])
         title = self.current[0]
         self.session.openWithCallback(self.cb_item_menu, ChoiceBox, title = title, list = lst) #TODO
 
@@ -440,22 +463,9 @@ class MainScreen(Screen):
         elif answer[1] == "favorites":
             lists = self.config.get_lists()
             lists2 = [(self.config.get_title(l),l) for l in lists]
-            print lists2
+            #print lists2
             self.session.openWithCallback(self.cb_favorites, ChoiceBox, title="Selected menu item will be added",list = lists2)
 
-        elif answer[1] in ("download2","download3"):  # ask download folder before
-            self.session.openWithCallback(self.download_prepare, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
-
-        elif answer[1] == 'download':
-            self.download_prepare(config.plugins.playstream.download_dir.value)
-
-        elif answer[1] == 'download_list':
-            self.download_list()
-
-        elif answer[1] == 'download_folder':
-            #downloadDir = "/media/hdd/movie" #config.plugins.playstream.downloadDir.value TODO
-            self.session.openWithCallback(self.cb_download_dir, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
-
         elif answer[1] == "delete":
             lst = self.cur_menu[1].replace("config::","")
             #print lst
@@ -464,6 +474,15 @@ class MainScreen(Screen):
             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.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)
+            #self.config.write_streams()
+            #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] == "rename":
             #name2 = "Renamed"
             self.session.openWithCallback(self.cb_rename,VirtualKeyBoard, title="Enter new item name", text=self.current[0])
@@ -471,6 +490,20 @@ class MainScreen(Screen):
         elif answer[1] == "add_list":
             self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO,timeout=5)
             pass #TODO
+
+        elif answer[1] in ("download2","download3"):  # ask download folder before
+            self.session.openWithCallback(self.download_prepare, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
+
+        elif answer[1] == 'download':
+            self.download_prepare(config.plugins.playstream.download_dir.value)
+
+        elif answer[1] == 'download_list':
+            self.download_list()
+
+        elif answer[1] == 'download_folder':
+            #downloadDir = "/media/hdd/movie" #config.plugins.playstream.downloadDir.value TODO
+            self.session.openWithCallback(self.cb_download_dir, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
+
         return
 
     def download_prepare(self, download_dir=""):
@@ -673,6 +706,20 @@ class MainScreen(Screen):
         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)
 
+    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)
+        #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)
+
     def config_screen(self):
         self.session.open(ConfigScreen,self)
 
@@ -991,7 +1038,10 @@ class ConfigScreen(ConfigListScreen,Screen):
             getConfigListEntry(_("TMP folder"), config.plugins.playstream.tmp_dir),
             getConfigListEntry(_("Clear tmp folder on exit"), config.plugins.playstream.clear_tmp),
             getConfigListEntry(_("Start playstreamproxy"), config.plugins.playstream.streamproxy_start),
-            getConfigListEntry(_("Check new plugin version in feed"), config.plugins.playstream.check_update)
+            getConfigListEntry(_("Check new plugin version in feed"), config.plugins.playstream.check_update),
+            getConfigListEntry(_("Content config file"), config.plugins.playstream.streams_file),
+            getConfigListEntry(_("Remote content config file"), config.plugins.playstream.streams_file_remote),
+            getConfigListEntry(_("User remote content config file"), config.plugins.playstream.use_streams_file_remote),
         ]
         ConfigListScreen.__init__(self, self.list, session = self.session)
         self["title"] = Label()

PlayStream.wpr

@@ -5121,8 +5121,8 @@ debug.var-col-widths = [0.3789319678127286,
 edit.bookmarks = {u'InfoScreen': (loc('PlayStream.py'),
                                   {'attrib-starts': [('InfoScreen',
         1100)],
-                                   'first-line': 646L,
-                                   'sel-line': 1122L})}
+                                   'first-line': 696L,
+                                   'sel-line': 1172L})}
 edit.file-encoding = {loc('streams.cfg'): 'utf_8'}
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                             'windows': [{'name': 'CLLIF0zyp30ULG6MKhIRp1Beg6'\
@@ -5151,7 +5151,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': False,
         'tree-states': {'deep': {'expanded-nodes': [],
-                                 'selected-nodes': [(73,)],
+                                 'selected-nodes': [(96,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('browser',
@@ -5710,18 +5710,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'top-node': [('generic attribute',
                       loc('../../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
                       'ALL_INVOKE_TYPES')]},
-        loc('unknown:<untitled> #2'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #1'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #2'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #1'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -5797,7 +5797,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'cb_download_dir',
                                        'fReverse': False,
-                                       'fSearchText': u'epic',
+                                       'fSearchText': u'streams_file_remote',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5909,277 +5909,268 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'toolbox-tree-sel': ''})],
         'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('PlayStream.py'),
         {'attrib-starts': [('MainScreen',
-                            91),
-                           ('MainScreen.__init__',
-                            92)],
-         'first-line': 89L,
-         'folded-linenos': [],
-         'sel-line': 97L,
-         'sel-line-start': 4383L,
-         'selection_end': 4423L,
-         'selection_start': 4419L,
+                            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,
          'zoom': 0L},
-        1507829627.696],
+        1520729521.3],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.__init__',
-                             92)],
-          'first-line': 94L,
-          'folded-linenos': [],
-          'sel-line': 102L,
-          'sel-line-start': 4614L,
-          'selection_end': 4636L,
-          'selection_start': 4632L,
+                             93),
+                            ('MainScreen.download_prepare',
+                             504)],
+          'first-line': 492L,
+          'folded-linenos': [334L],
+          'sel-line': 508L,
+          'sel-line-start': 22774L,
+          'selection_end': 22774L,
+          'selection_start': 22774L,
           'zoom': 0L},
-         1507829642.19],
+         1520729680.381],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.__init__',
-                             92)],
-          'first-line': 94L,
-          'folded-linenos': [],
-          'sel-line': 102L,
-          'sel-line-start': 4614L,
-          'selection_end': 4650L,
-          'selection_start': 4648L,
+                             93),
+                            ('MainScreen.cb_move',
+                             704)],
+          'first-line': 701L,
+          'folded-linenos': [334L],
+          'sel-line': 712L,
+          'sel-line-start': 31243L,
+          'selection_end': 31253L,
+          'selection_start': 31253L,
           'zoom': 0L},
-         1507829643.542],
+         1520730166.753],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.__init__',
-                             92)],
-          'first-line': 122L,
-          'folded-linenos': [],
-          'sel-line': 129L,
-          'sel-line-start': 5716L,
-          'selection_end': 5747L,
-          'selection_start': 5747L,
+                             93),
+                            ('MainScreen.layout_finished',
+                             133)],
+          'first-line': 144L,
+          'folded-linenos': [334L],
+          'sel-line': 150L,
+          'sel-line-start': 6838L,
+          'selection_end': 6849L,
+          'selection_start': 6849L,
           'zoom': 0L},
-         1507829681.866],
+         1520730504.623],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.back',
-                             364)],
-          'first-line': 356L,
-          'folded-linenos': [],
-          'sel-line': 366L,
-          'sel-line-start': 15836L,
-          'selection_end': 15853L,
-          'selection_start': 15853L,
+                             93),
+                            ('MainScreen.layout_finished',
+                             133)],
+          'first-line': 144L,
+          'folded-linenos': [334L],
+          'sel-line': 156L,
+          'sel-line-start': 7225L,
+          'selection_end': 7253L,
+          'selection_start': 7245L,
           'zoom': 0L},
-         1507829754.074],
+         1520730506.911],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.cancel',
-                             373)],
-          'first-line': 359L,
-          'folded-linenos': [],
-          'sel-line': 374L,
-          'sel-line-start': 16030L,
-          'selection_end': 16051L,
-          'selection_start': 16051L,
+                             93),
+                            ('MainScreen.layout_finished',
+                             133)],
+          'first-line': 149L,
+          'folded-linenos': [334L],
+          'sel-line': 158L,
+          'sel-line-start': 7352L,
+          'selection_end': 7380L,
+          'selection_start': 7372L,
           'zoom': 0L},
-         1507831049.52],
+         1520730508.241],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.ok',
-                             264)],
-          'first-line': 268L,
-          'folded-linenos': [274L,
-                             304L,
-                             317L],
-          'sel-line': 309L,
-          'sel-line-start': 13551L,
-          'selection_end': 13614L,
-          'selection_start': 13602L,
+                             93),
+                            ('MainScreen.layout_finished',
+                             133)],
+          'first-line': 154L,
+          'folded-linenos': [334L],
+          'sel-line': 163L,
+          'sel-line-start': 7581L,
+          'selection_end': 7605L,
+          'selection_start': 7597L,
           'zoom': 0L},
-         1507831362.477],
+         1520730508.806],
         [loc('PlayStream.py'),
-         {'attrib-starts': [],
-          'first-line': 0L,
-          'folded-linenos': [274L,
-                             304L,
-                             317L],
-          'sel-line': 4L,
-          'sel-line-start': 181L,
-          'selection_end': 253L,
-          'selection_start': 252L,
+         {'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,
           'zoom': 0L},
-         1507831525.741],
+         1520730509.756],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.__init__',
-                             92)],
-          'first-line': 87L,
-          'folded-linenos': [274L,
-                             304L,
-                             317L],
-          'sel-line': 98L,
-          'sel-line-start': 4427L,
-          'selection_end': 4447L,
-          'selection_start': 4446L,
+                             93),
+                            ('MainScreen.ok',
+                             281)],
+          'first-line': 309L,
+          'folded-linenos': [334L],
+          'sel-line': 318L,
+          'sel-line-start': 14267L,
+          'selection_end': 14291L,
+          'selection_start': 14283L,
           'zoom': 0L},
-         1507831526.16],
+         1520730510.98],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.layout_finished',
-                             131)],
-          'first-line': 133L,
-          'folded-linenos': [274L,
-                             304L,
-                             317L],
-          'sel-line': 144L,
-          'sel-line-start': 6439L,
-          'selection_end': 6459L,
-          'selection_start': 6452L,
+                             93),
+                            ('MainScreen.download_prepare',
+                             504)],
+          'first-line': 500L,
+          'folded-linenos': [334L],
+          'sel-line': 512L,
+          'sel-line-start': 23013L,
+          'selection_end': 23034L,
+          'selection_start': 23026L,
           'zoom': 0L},
-         1507831529.254],
+         1520730513.813],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.ok',
-                             264)],
-          'first-line': 266L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 306L,
-          'sel-line-start': 13418L,
-          'selection_end': 13458L,
-          'selection_start': 13451L,
+                             93),
+                            ('MainScreen.download_prepare',
+                             504)],
+          'first-line': 507L,
+          'folded-linenos': [334L],
+          'sel-line': 519L,
+          'sel-line-start': 23336L,
+          'selection_end': 23360L,
+          'selection_start': 23352L,
           'zoom': 0L},
-         1507831597.851],
+         1520730517.47],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.back',
-                             364)],
-          'first-line': 356L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 369L,
-          'sel-line-start': 15901L,
-          'selection_end': 15925L,
-          'selection_start': 15925L,
+                             93),
+                            ('MainScreen.download_prepare',
+                             504)],
+          'first-line': 512L,
+          'folded-linenos': [334L],
+          'sel-line': 521L,
+          'sel-line-start': 23433L,
+          'selection_end': 23457L,
+          'selection_start': 23449L,
           'zoom': 0L},
-         1507831644.478],
+         1520730518.156],
         [loc('PlayStream.py'),
-         {'attrib-starts': [],
-          'first-line': 0L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 8L,
-          'sel-line-start': 397L,
-          'selection_end': 416L,
-          'selection_start': 416L,
-          'zoom': 0L},
-         1507979460.326],
-        [loc('changelog.md'),
-         {'attrib-starts': [],
-          'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 0L,
-          'sel-line-start': 0L,
-          'selection_end': 6L,
-          'selection_start': 6L,
+         {'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,
           'zoom': 0L},
-         1508001991.368],
+         1520730523.631],
         [loc('PlayStream.py'),
-         {'attrib-starts': [],
-          'first-line': 0L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 8L,
-          'sel-line-start': 397L,
-          'selection_end': 416L,
-          'selection_start': 416L,
+         {'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,
           'zoom': 0L},
-         1508001995.995],
+         1520730526.858],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91),
+                             93),
                             ('MainScreen.layout_finished',
-                             131)],
-          'first-line': 127L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 136L,
-          'sel-line-start': 6000L,
-          'selection_end': 6081L,
-          'selection_start': 6074L,
+                             133)],
+          'first-line': 151L,
+          'folded-linenos': [334L],
+          'sel-line': 157L,
+          'sel-line-start': 7314L,
+          'selection_end': 7329L,
+          'selection_start': 7329L,
           'zoom': 0L},
-         1508002000.083],
+         1520730990.901],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('MainScreen',
-                             91),
-                            ('MainScreen.decode_finished',
-                             232)],
-          'first-line': 230L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 242L,
-          'sel-line-start': 10657L,
-          'selection_end': 10679L,
-          'selection_start': 10672L,
+         {'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,
           'zoom': 0L},
-         1508002010.046],
+         1520730995.581],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('StreamInfo',
-                             1150),
-                            ('StreamInfo.download_finished',
-                             1199)],
-          'first-line': 1189L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 1201L,
-          'sel-line-start': 50727L,
-          'selection_end': 50754L,
-          'selection_start': 50751L,
+         {'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},
-         1508002013.231],
+         1520730997.006],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('StreamInfo',
-                             1150),
-                            ('StreamInfo.download_finished',
-                             1199)],
-          'first-line': 1196L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 1208L,
-          'sel-line-start': 51174L,
-          'selection_end': 51203L,
-          'selection_start': 51203L,
+         {'attrib-starts': [],
+          'first-line': 75L,
+          'folded-linenos': [334L],
+          'sel-line': 80L,
+          'sel-line-start': 3841L,
+          'selection_end': 3886L,
+          'selection_start': 3867L,
           'zoom': 0L},
-         1508002130.982],
+         1520730997.75],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [],
+          'first-line': 75L,
+          'folded-linenos': [334L],
+          'sel-line': 81L,
+          'sel-line-start': 3952L,
+          'selection_end': 4001L,
+          'selection_start': 3982L,
+          'zoom': 0L},
+         1520730998.238],
         [loc('PlayStream.py'),
          {'attrib-starts': [('MainScreen',
-                             91)],
-          'first-line': 83L,
-          'folded-linenos': [274L,
-                             317L],
-          'sel-line': 91L,
-          'sel-line-start': 4196L,
-          'selection_end': 4212L,
-          'selection_start': 4202L,
+                             93),
+                            ('MainScreen.layout_finished',
+                             133)],
+          'first-line': 138L,
+          'folded-linenos': [334L],
+          'sel-line': 150L,
+          'sel-line-start': 6838L,
+          'selection_end': 6898L,
+          'selection_start': 6879L,
           'zoom': 0L},
-         1508002139.334]],
+         1520730999.326]],
         20),
         'current-loc': loc('PlayStream.py'),
         'editor-state-list': [(loc('changelog.md'),
                                {'attrib-starts': [],
                                 'first-line': 0L,
                                 'folded-linenos': [],
-                                'sel-line': 0L,
-                                'sel-line-start': 0L,
-                                'selection_end': 6L,
-                                'selection_start': 6L,
+                                'sel-line': 2L,
+                                'sel-line-start': 69L,
+                                'selection_end': 69L,
+                                'selection_start': 69L,
                                 'zoom': 0L}),
                               (loc('plugin.py'),
                                {'attrib-starts': [],
@@ -6192,16 +6183,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'zoom': 0L}),
                               (loc('PlayStream.py'),
                                {'attrib-starts': [('MainScreen',
-        91),
-        ('MainScreen.decode_finished',
-         232)],
-                                'first-line': 226L,
-                                'folded-linenos': [274L,
-        317L],
-                                'sel-line': 236L,
-                                'sel-line-start': 10439L,
-                                'selection_end': 10477L,
-                                'selection_start': 10468L,
+        93),
+        ('MainScreen.layout_finished',
+         133)],
+                                'first-line': 156L,
+                                'folded-linenos': [338L],
+                                'sel-line': 151L,
+                                'sel-line-start': 6937L,
+                                'selection_end': 6972L,
+                                'selection_start': 6972L,
                                 'zoom': 0L}),
                               (loc('VideoDownload.py'),
                                {'attrib-starts': [('VideoDownloadList',
@@ -6335,7 +6325,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'content/sources/SourceBase.py',
         u'content/sources/cinemalive.py',
         u'imake.bat',
-        u'plugin.py',
         u'skin.xml',
         u'test_download.py',
         u'../python/Tools/BoundFunction.py',
@@ -6343,6 +6332,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'../python/skin.py',
         u'../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py',
         u'changelog.md',
+        u'plugin.py',
         u'PlayStream.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.4733405875952122},
@@ -6359,6 +6349,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          1880,
                          1100)}]}
 guimgr.recent-documents = [loc('PlayStream.py'),
+                           loc('plugin.py'),
                            loc('changelog.md'),
                            loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'),
                            loc('skin.xml'),
@@ -6369,8 +6360,7 @@ guimgr.recent-documents = [loc('PlayStream.py'),
                            loc('test_download.py'),
                            loc('../python/Tools/BoundFunction.py'),
                            loc('../python/skin.py'),
-                           loc('../python/enigma.py'),
-                           loc('plugin.py')]
+                           loc('../python/enigma.py')]
 guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
         'rse_arguments',
         9)],
@@ -7582,26 +7572,26 @@ search.replace-history = [u'cb_download_dir',
                           u'filmix.me',
                           u'self',
                           u'current']
-search.search-history = [u'decoded',
+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',
+                         u'self.config',
+                         u'sources',
+                         u'decoded',
                          u'history',
                          u'exit',
                          u'warning',
                          u'warn',
-                         u'war',
-                         u'PictureData',
-                         u'tls',
-                         u'picturedata',
-                         u'decode_finished',
-                         u'picture',
-                         u'callbac',
-                         u'etimer',
-                         u'ClientTLSOptions',
-                         u'key_exit',
-                         u'back',
-                         u'downloadPage',
-                         u'download_image_failed',
-                         u'boundFunction',
-                         u'resolveFilename']
+                         u'war']
 testing.stored-results = (1,
                           [],
                           {})

changelog.md

@@ -1,3 +1,14 @@
+**0.7s** (10.03.2018)
+- [change] Delete un Move favorītos stradā
+
+**0.7r** (10.03.2018)
+- [change] uzlabota ltc informācija
+- [feature] iespēja opcijās norādīt streams.cfg faila atrašanos/nosaukumu gan lokālā failu sistēmā gan ftp (ftp://user:password@host/path/too/streams.cfg), gan http (rakstīšana netiek atbalstīta)
+- [change] filmix rādā visus tulkojumus/strīmus (agrak tikai pirmo)
+
+**0.7p** (12.12.2017)
+- [change] salabots euronews
+
 **0.7o** (10.12.2017)
 - [change] salabots ltc search
 - [change] salabots filmix search