COnfig logs ar parametriem

PlayStream.py

@@ -42,15 +42,107 @@ from Components.config import config, ConfigSubsection, ConfigText, ConfigIntege
 
 import ContentSources
 import util
-from sources.SourceBase import stream0
 from VideoDownload import downloadJob, HLSDownloadJob,VideoDownloadList
 #import enigma2_api
-
-TMPDIR = "/tmp/playstream/"
 e2 = None
-config.playstream = ConfigSubsection()
-config.playstream.locations = ConfigLocations(default=["/media/hdd/movie/"])
-config.playstream.download_dir = ConfigText(default="/media/hdd/movie/")
+
+##########################################################################
+from Components.config import config, ConfigSubsection, ConfigYesNo, getConfigListEntry, \
+     ConfigSelection, ConfigNumber, ConfigDirectory,ConfigText
+from Components.ConfigList import ConfigListScreen
+from Screens.LocationBox import LocationBox
+
+config.plugins.playstream = ConfigSubsection()
+config.plugins.playstream.locations = ConfigLocations(default=["/media/hdd/movie/"])
+config.plugins.playstream.download_dir = ConfigDirectory(default="/media/hdd/movie/")
+config.plugins.playstream.tmp_dir = ConfigDirectory(default="/tmp/playstream/")
+config.plugins.playstream.streamproxy_start = ConfigYesNo(default = True)
+#config.plugins.playstream.size = ConfigSelection({"400x240":"400x240","220x132":"220x132","100x60":"100x60"}, default="220x132")
+config.plugins.playstream.clear_tmp = ConfigYesNo(default = True)
+
+class ConfigScreen(ConfigListScreen,Screen):
+    skin = """
+<screen position="center,center" size="560,400" title="PlayStream Configuration" >
+	<ePixmap name="red"    position="0,0"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+	<ePixmap name="green"  position="140,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
+	<ePixmap name="yellow" position="280,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+	<ePixmap name="blue"   position="420,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+
+	<widget name="key_red" position="0,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+	<widget name="key_green" position="140,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+	<widget name="key_yellow" position="280,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+	<widget name="key_blue" position="420,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+
+	<widget name="config" position="10,40" size="540,340" scrollbarMode="showOnDemand" />
+</screen>"""
+
+    def __init__(self, session, args = 0):
+        self.session = session
+        #self.setup_title = "Options"
+        Screen.__init__(self, session)
+        cfg = config.plugins.playstream
+        self.list = [
+            getConfigListEntry(_("Download folder"), cfg.download_dir),
+            getConfigListEntry(_("TMP folder"), cfg.tmp_dir),
+            getConfigListEntry(_("Clear tmp folder on exit"), cfg.clear_tmp),
+            getConfigListEntry(_("Start playstreamproxy"), cfg.streamproxy_start),
+        ]
+        ConfigListScreen.__init__(self, self.list, session = self.session)
+        self["key_red"] = Button(_("Cancel"))
+        self["key_green"] = Button(_("Save"))
+        self["key_yellow"] = Button("")
+        self["key_blue"] = Button("")
+        self["setupActions"] = ActionMap(["SetupActions", "ColorActions"],
+                                         {
+                                             "red": self.cancel,
+                                             "green": self.save,
+                                             "save": self.save,
+                                             "cancel": self.cancel,
+                                             "ok": self.ok,
+                                             }, -2)
+
+    def getCurrentEntry(self):
+        return self["config"].getCurrent()[0]
+
+    def getCurrentValue(self):
+        return str(self["config"].getCurrent()[1].getText())
+
+    def ok(self):
+        if self["config"].getCurrent()[1] == config.plugins.playstream.download_dir:
+            folder = config.plugins.playstream.download_dir.value
+            #self.session.openWithCallback(self.select_download_dir, LocationBox,"Select Folder")
+            self.session.openWithCallback(self.select_download_dir, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
+        elif self["config"].getCurrent()[1] == config.plugins.playstream.tmp_dir:
+            self.session.openWithCallback(self.select_tmp_dir, LocationBox,"Select tmp folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
+        else:
+            self.save()
+
+    def select_download_dir(self, folder, select=None):
+        if not folder:
+            return
+        print "Folder selected - %s"%folder
+        config.plugins.playstream.download_dir.setValue(folder)
+        config.plugins.playstream.download_dir.save()
+        config.plugins.playstream.locations.save()
+        config.save()
+
+    def select_tmp_dir(self, folder, select=None):
+        if not folder:
+            return
+        print "Folder selected - %s"%folder
+        config.plugins.playstream.tmp_dir.setValue(folder)
+        config.plugins.playstream.tmp_dir.save()
+        config.plugins.playstream.locations.save()
+        config.save()
+
+    def save(self):
+        print "saving"
+        self.saveAll()
+        self.close(True,self.session)
+
+    def cancel(self):
+        #print "cancel"
+        self.close(False,self.session)
 
 def make_service(stream):
     url = stream["url"]
@@ -356,8 +448,10 @@ class MainScreen(Screen):
     <widget name="key_green" position="290,535" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
     <ePixmap name="yellow" position="430,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
     <widget name="key_yellow" position="430,535" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="menu"   position="610,540" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
-    <widget name="key_menu" position="610,535" size="140,40" valign="center" halign="center" zPosition="4"  backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="blue" position="570,535" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+    <widget name="key_blue" position="570,535" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+    <ePixmap name="menu"   position="750,540" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
+    <widget name="key_menu" position="750,535" size="140,40" valign="center" halign="center" zPosition="4"  backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
 
 </screen>"""
 
@@ -369,6 +463,7 @@ class MainScreen(Screen):
         self["key_red"] = Button(_("Exit"))
         self["key_green"] = Button(_("Select"))
         self["key_yellow"] = Button(_("Options"))
+        self["key_blue"] = Button(_("Config"))
         self["key_menu"] = Button("Menu")
         self["key_exit"] = Button("Back")
 
@@ -379,7 +474,7 @@ class MainScreen(Screen):
                                         "green": self.Ok,
                                         "red": self.Cancel,
                                         "yellow": self.options_screen,
-                                        "blue": self.download_list,
+                                        "blue": self.config_screen,
                                         "menu": self.item_menu,
                                         "cancel": self.Back,
                                     })
@@ -390,8 +485,8 @@ class MainScreen(Screen):
         self["title"] = Label()
         self.downloading = 0
         self.activeDownloads = 0
-        if not os.path.exists(TMPDIR):
-            os.mkdir(TMPDIR)
+        if not os.path.exists(config.plugins.playstream.tmp_dir.value):
+            os.mkdir(config.plugins.playstream.tmp_dir.value)
         self.onLayoutFinish.append(self.LayoutFinish)
 
     def LayoutFinish(self):
@@ -455,7 +550,7 @@ class MainScreen(Screen):
         else:
             if image_url.startswith("http"):
                 fname = image_url.replace(":","-").replace("/","_")
-                image_path = os.path.join(TMPDIR, fname)
+                image_path = os.path.join(config.plugins.playstream.tmp_dir.value, fname)
                 self.download_image(image_path, image_url)
             else: # local file
                 image_path = os.path.join(self.cur_directory,image_url)
@@ -596,10 +691,12 @@ class MainScreen(Screen):
         self.SelectionChanged()
 
     def Cancel(self):
-        #if os.path.exists(TMPDIR):
-            #for name in os.listdir(TMPDIR):
-                #os.remove(os.path.join(TMPDIR, name))
-            #os.rmdir(TMPDIR)
+        print "Exiting PlayStream"
+        if config.plugins.playstream.clear_tmp.value and os.path.exists(config.plugins.playstream.tmp_dir.value):
+            for name in os.listdir(config.plugins.playstream.tmp_dir.value):
+                #print "remove "+os.path.join(config.plugins.playstream.tmp_dir.value, name)
+                os.remove(os.path.join(config.plugins.playstream.tmp_dir.value, name))
+            #os.rmdir(config.plugins.playstream.tmp_dir.value)
         self.close()
 
 
@@ -678,7 +775,7 @@ class MainScreen(Screen):
 
         elif answer[1] == 'download_folder':
             #downloadDir = "/media/hdd/movie" #config.plugins.playstream.downloadDir.value TODO
-            self.session.openWithCallback(self.select_download_dir, LocationBox,"Select download folder","",config.playstream.download_dir.value,config.playstream.locations,False,"Select folder",None,True,True)
+            self.session.openWithCallback(self.select_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::","")
@@ -701,9 +798,9 @@ class MainScreen(Screen):
         if not downloadDir:
             return
         print "Folder selected - %s"%downloadDir
-        config.playstream.download_dir.setValue(downloadDir)
-        config.playstream.download_dir.save()
-        config.playstream.locations.save()
+        config.plugins.playstream.download_dir.setValue(downloadDir)
+        config.plugins.playstream.download_dir.save()
+        config.plugins.playstream.locations.save()
         config.save()
 
     def download_list(self):
@@ -750,7 +847,7 @@ class MainScreen(Screen):
         title = self.stream["name"].strip()
         url = self.stream["url"]
         stream_type = self.stream["type"] #self.sources.stream_type(stream["url"])
-        downloadDir = config.playstream.download_dir.value
+        downloadDir = config.plugins.playstream.download_dir.value
         if not os.path.exists(downloadDir):
             print 'Sorry, download directory "%s" not exist!\nPlease specify in the settings existing directory'%downloadDir
             self.msg0(_('Sorry, download directory "%s" not exist!\nPlease specify in the settings existing directory'%downloadDir))
@@ -831,6 +928,9 @@ 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 config_screen(self):
+        self.session.open(ConfigScreen,self)
+
     def options_screen(self):
         source = self.cur_menu[1].split("::")[0]
         options = self.sources.options_read(source)
@@ -857,7 +957,7 @@ from Components.config import config, ConfigSubsection, ConfigYesNo,\
 from Components.ConfigList import ConfigListScreen
 #from Screens.LocationBox import LocationBox
 
-config.plugins.playstream = ConfigSubDict()
+#config.plugins.playstream = ConfigSubDict()
 
 class OptionsScreen(ConfigListScreen,Screen):
     skin = """
@@ -880,7 +980,7 @@ class OptionsScreen(ConfigListScreen,Screen):
         self.main = args[0]
         self.setTitle(self.main.cur_menu[0]+" options")
         self.source = self.main.cur_menu[1].split("::")[0]
-        self.cfg = config.plugins.playstream
+        self.cfg = ConfigSubDict() #config.plugins.playstream
         self.list = []
         self.options = self.main.sources.options_read(self.source)
         if not self.options:

PlayStream.wpr

@@ -5054,21 +5054,21 @@ edit.bookmarks = {'Ok': (loc('PlayStream.py'),
         ('MainScreen.Ok',
          243)],
                           'first-line': 237,
-                          'sel-line': 498L}),
+                          'sel-line': 594L}),
                   'cb_item_menu': (loc('PlayStream.py'),
                                    {'attrib-starts': [('MainScreen',
         72),
         ('MainScreen.cb_item_menu',
          349)],
                                     'first-line': 364,
-                                    'sel-line': 635L}),
+                                    'sel-line': 733L}),
                   'item_menu': (loc('PlayStream.py'),
                                 {'attrib-starts': [('MainScreen',
         69),
         ('MainScreen.item_menu',
          320)],
                                  'first-line': 312,
-                                 'sel-line': 613L})}
+                                 'sel-line': 711L})}
 edit.file-encoding = {loc('streams.cfg'): 'utf_8'}
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                             'windows': [{'name': 'CLLIF0zyp30ULG6MKhIRp1Beg6'\
@@ -5165,9 +5165,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fMatchCase': False,
                                        'fOmitBinary': True,
                                        'fRegexFlags': 46,
-                                       'fReplaceText': u'movieplace',
+                                       'fReplaceText': u'config.plugins.playstream.',
                                        'fReverse': False,
-                                       'fSearchText': u'urlp',
+                                       'fSearchText': u'yesno',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5252,221 +5252,218 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       'wide',
                       1,
                       {})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/viaplay.py'),
-        {'attrib-starts': [('Source',
-                            26),
-                           ('Source.get_streams',
-                            308)],
-         'first-line': 359L,
-         'folded-linenos': [],
-         'sel-line': 363L,
-         'sel-line-start': 17585L,
-         'selection_end': 17617L,
-         'selection_start': 17617L},
-        1484608183.824],
-        [loc('sources/viaplay.py'),
-         {'attrib-starts': [('Source',
-                             26),
-                            ('Source.get_streams',
-                             308)],
-          'first-line': 359L,
-          'folded-linenos': [],
-          'sel-line': 383L,
-          'sel-line-start': 18370L,
-          'selection_end': 18391L,
-          'selection_start': 18391L},
-         1484608191.386],
-        [loc('sources/viaplay.py'),
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('PlayStream.py'),
+        {'attrib-starts': [('ConfigScreen',
+                            63),
+                           ('ConfigScreen.cancel',
+                            143)],
+         'first-line': 122L,
+         'folded-linenos': [191L],
+         'sel-line': 143L,
+         'sel-line-start': 7502L,
+         'selection_end': 7513L,
+         'selection_start': 7506L},
+        1484780355.806],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('ConfigScreen',
+                             63),
+                            ('ConfigScreen.cancel',
+                             143)],
+          'first-line': 122L,
+          'folded-linenos': [191L],
+          'sel-line': 143L,
+          'sel-line-start': 7502L,
+          'selection_end': 7514L,
+          'selection_start': 7506L},
+         1484780356.592],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('MainScreen',
+                             424),
+                            ('MainScreen.Cancel',
+                             690)],
+          'first-line': 479L,
+          'folded-linenos': [191L],
+          'sel-line': 694L,
+          'sel-line-start': 30920L,
+          'selection_end': 30937L,
+          'selection_start': 30937L},
+         1484780625.051],
+        [loc('PlayStream.py'),
          {'attrib-starts': [],
-          'first-line': 428L,
-          'folded-linenos': [],
-          'sel-line': 449L,
-          'sel-line-start': 21214L,
-          'selection_end': 21230L,
-          'selection_start': 21226L},
-         1484608209.637],
-        [loc('sources/viaplay.py'),
+          'first-line': 27L,
+          'folded-linenos': [191L],
+          'sel-line': 47L,
+          'sel-line-start': 1907L,
+          'selection_end': 1913L,
+          'selection_start': 1907L},
+         1484780642.887],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('ConfigScreen',
+                             62),
+                            ('ConfigScreen.ok',
+                             109)],
+          'first-line': 108L,
+          'folded-linenos': [190L],
+          'sel-line': 115L,
+          'sel-line-start': 6460L,
+          'selection_end': 6534L,
+          'selection_start': 6523L},
+         1484780727.258],
+        [loc('PlayStream.py'),
          {'attrib-starts': [],
-          'first-line': 427L,
-          'folded-linenos': [],
-          'sel-line': 450L,
-          'sel-line-start': 21262L,
-          'selection_end': 21290L,
-          'selection_start': 21286L},
-         1484608219.88],
-        [loc('sources/viaplay.py'),
+          'first-line': 47L,
+          'folded-linenos': [190L],
+          'sel-line': 52L,
+          'sel-line-start': 2197L,
+          'selection_end': 2221L,
+          'selection_start': 2210L},
+         1484780729.99],
+        [loc('PlayStream.py'),
          {'attrib-starts': [],
-          'first-line': 7L,
-          'folded-linenos': [],
-          'sel-line': 12L,
-          'sel-line-start': 344L,
-          'selection_end': 365L,
-          'selection_start': 361L},
-         1484608221.118],
-        [loc('sources/viaplay.py'),
-         {'attrib-starts': [('Source',
-                             26),
-                            ('Source.get_streams',
-                             308)],
-          'first-line': 351L,
-          'folded-linenos': [],
-          'sel-line': 372L,
-          'sel-line-start': 17955L,
-          'selection_end': 17972L,
-          'selection_start': 17968L},
-         1484608222.226],
-        [loc('sources/viaplay.py'),
+          'first-line': 47L,
+          'folded-linenos': [190L],
+          'sel-line': 52L,
+          'sel-line-start': 2197L,
+          'selection_end': 2240L,
+          'selection_start': 2229L},
+         1484780731.293],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('ConfigScreen',
+                             62),
+                            ('ConfigScreen.ok',
+                             109)],
+          'first-line': 91L,
+          'folded-linenos': [190L],
+          'sel-line': 112L,
+          'sel-line-start': 6053L,
+          'selection_end': 6133L,
+          'selection_start': 6122L},
+         1484780742.038],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('ConfigScreen',
+                             62),
+                            ('ConfigScreen.ok',
+                             109)],
+          'first-line': 100L,
+          'folded-linenos': [190L],
+          'sel-line': 113L,
+          'sel-line-start': 6151L,
+          'selection_end': 6230L,
+          'selection_start': 6219L},
+         1484780744.713],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('ConfigScreen',
+                             62),
+                            ('ConfigScreen.ok',
+                             109)],
+          'first-line': 100L,
+          'folded-linenos': [190L],
+          'sel-line': 115L,
+          'sel-line-start': 6460L,
+          'selection_end': 6534L,
+          'selection_start': 6523L},
+         1484780745.163],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('MainScreen',
+                             423),
+                            ('MainScreen.cb_item_menu',
+                             731)],
+          'first-line': 753L,
+          'folded-linenos': [190L],
+          'sel-line': 774L,
+          'sel-line-start': 34465L,
+          'selection_end': 34544L,
+          'selection_start': 34533L},
+         1484780760.773],
+        [loc('PlayStream.py'),
          {'attrib-starts': [],
-          'first-line': 428L,
-          'folded-linenos': [],
-          'sel-line': 449L,
-          'sel-line-start': 21214L,
-          'selection_end': 21230L,
-          'selection_start': 21226L},
-         1484608613.773],
+          'first-line': 933L,
+          'folded-linenos': [190L],
+          'sel-line': 954L,
+          'sel-line-start': 42167L,
+          'selection_end': 42192L,
+          'selection_start': 42181L},
+         1484780762.115],
         [loc('PlayStream.py'),
-         {'attrib-starts': [('make_service',
-                             54)],
-          'first-line': 53L,
-          'folded-linenos': [],
-          'sel-line': 73L,
-          'sel-line-start': 2951L,
-          'selection_end': 2982L,
-          'selection_start': 2982L},
-         1484608795.724],
-        [loc('sources/movieplace.py'),
-         {'attrib-starts': [('Source',
-                             23),
-                            ('Source.__init__',
-                             25)],
-          'first-line': 6L,
-          'folded-linenos': [],
+         {'attrib-starts': [],
+          'first-line': 933L,
+          'folded-linenos': [190L],
+          'sel-line': 954L,
+          'sel-line-start': 42167L,
+          'selection_end': 42211L,
+          'selection_start': 42200L},
+         1484780762.57],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('OptionsScreen',
+                             958),
+                            ('OptionsScreen.ok',
+                             1009)],
+          'first-line': 992L,
+          'folded-linenos': [190L],
+          'sel-line': 1013L,
+          'sel-line-start': 45763L,
+          'selection_end': 45834L,
+          'selection_start': 45823L},
+         1484780763.064],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [],
+          'first-line': 23L,
+          'folded-linenos': [190L],
           'sel-line': 28L,
-          'sel-line-start': 808L,
-          'selection_end': 864L,
-          'selection_start': 864L},
-         1484645225.827],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             15),
-                            ('ContentSources.get_content',
-                             48)],
-          'first-line': 47L,
-          'folded-linenos': [],
-          'sel-line': 60L,
-          'sel-line-start': 2605L,
-          'selection_end': 2626L,
-          'selection_start': 2626L},
-         1484645249.28],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             24),
-                            ('Source.get_content',
-                             49)],
-          'first-line': 97L,
-          'folded-linenos': [],
-          'sel-line': 119L,
-          'sel-line-start': 4772L,
-          'selection_end': 4772L,
-          'selection_start': 4772L},
-         1484645274.974],
-        [loc('util.py'),
-         {'attrib-starts': [('play_video',
-                             49)],
-          'first-line': 58L,
-          'folded-linenos': [],
-          'sel-line': 71L,
-          'sel-line-start': 1951L,
-          'selection_end': 1951L,
-          'selection_start': 1951L},
-         1484645288.691],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             24),
-                            ('Source.get_content',
-                             49)],
-          'first-line': 70L,
-          'folded-linenos': [],
-          'sel-line': 75L,
-          'sel-line-start': 2549L,
-          'selection_end': 2549L,
-          'selection_start': 2549L},
-         1484681063.486],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             14),
-                            ('ContentSources.get_content',
-                             47)],
-          'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 59L,
-          'sel-line-start': 2432L,
-          'selection_end': 2453L,
-          'selection_start': 2453L},
-         1484681485.732],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             24),
-                            ('Source.get_content',
-                             49)],
-          'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 75L,
-          'sel-line-start': 2549L,
-          'selection_end': 2549L,
-          'selection_start': 2549L},
-         1484681490.881],
-        [loc('ContentSources.py'),
+          'sel-line-start': 1089L,
+          'selection_end': 1113L,
+          'selection_start': 1102L},
+         1484780764.532],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [],
+          'first-line': 23L,
+          'folded-linenos': [190L],
+          'sel-line': 28L,
+          'sel-line-start': 1089L,
+          'selection_end': 1132L,
+          'selection_start': 1121L},
+         1484780765.415],
+        [loc('PlayStream.py'),
          {'attrib-starts': [],
-          'first-line': 154L,
-          'folded-linenos': [],
-          'sel-line': 179L,
-          'sel-line-start': 6128L,
-          'selection_end': 6163L,
-          'selection_start': 6163L},
-         1484682345.643],
-        [loc('sources/serialguru.py'),
-         {'attrib-starts': [('Source',
-                             21),
-                            ('Source.get_content',
-                             45)],
-          'first-line': 151L,
-          'folded-linenos': [],
-          'sel-line': 165L,
-          'sel-line-start': 9363L,
-          'selection_end': 9363L,
-          'selection_start': 9363L},
-         1484682357.737],
-        [loc('ContentSources.py'),
+          'first-line': 31L,
+          'folded-linenos': [190L],
+          'sel-line': 52L,
+          'sel-line-start': 2197L,
+          'selection_end': 2221L,
+          'selection_start': 2210L},
+         1484780766.662],
+        [loc('PlayStream.py'),
          {'attrib-starts': [],
-          'first-line': 176L,
-          'folded-linenos': [],
-          'sel-line': 198L,
-          'sel-line-start': 6811L,
-          'selection_end': 6811L,
-          'selection_start': 6811L},
-         1484683092.344],
-        [loc('util.py'),
-         {'attrib-starts': [('play_video',
-                             49)],
-          'first-line': 57L,
-          'folded-linenos': [],
-          'sel-line': 71L,
-          'sel-line-start': 1951L,
-          'selection_end': 1951L,
-          'selection_start': 1951L},
-         1484683112.755],
-        [loc('ContentSources.py'),
+          'first-line': 31L,
+          'folded-linenos': [190L],
+          'sel-line': 52L,
+          'sel-line-start': 2197L,
+          'selection_end': 2240L,
+          'selection_start': 2229L},
+         1484780767.334],
+        [loc('PlayStream.py'),
+         {'attrib-starts': [('ConfigScreen',
+                             62),
+                            ('ConfigScreen.ok',
+                             109)],
+          'first-line': 0L,
+          'folded-linenos': [190L],
+          'sel-line': 113L,
+          'sel-line-start': 6151L,
+          'selection_end': 6230L,
+          'selection_start': 6219L},
+         1484780976.305],
+        [loc('PlayStream.py'),
          {'attrib-starts': [],
-          'first-line': 176L,
-          'folded-linenos': [],
-          'sel-line': 198L,
-          'sel-line-start': 6811L,
-          'selection_end': 6812L,
-          'selection_start': 6812L},
-         1484683129.526]],
+          'first-line': 930L,
+          'folded-linenos': [190L],
+          'sel-line': 952L,
+          'sel-line-start': 42018L,
+          'selection_end': 42089L,
+          'selection_start': 42074L},
+         1484781120.258]],
         20),
-        'current-loc': loc('ContentSources.py'),
+        'current-loc': loc('PlayStream.py'),
         'editor-state-list': [(loc('plugin.py'),
                                {'attrib-starts': [('main',
         4)],
@@ -5477,14 +5474,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 118L,
                                 'selection_start': 112L}),
                               (loc('PlayStream.py'),
-                               {'attrib-starts': [('make_service',
-        54)],
-                                'first-line': 53L,
-                                'folded-linenos': [],
-                                'sel-line': 73L,
-                                'sel-line-start': 2951L,
-                                'selection_end': 2982L,
-                                'selection_start': 2982L}),
+                               {'attrib-starts': [('MainScreen',
+        423),
+        ('MainScreen.__init__',
+         457)],
+                                'first-line': 457L,
+                                'folded-linenos': [190L],
+                                'sel-line': 465L,
+                                'sel-line-start': 21582L,
+                                'selection_end': 21625L,
+                                'selection_start': 21625L}),
                               (loc('ContentSources.py'),
                                {'attrib-starts': [],
                                 'first-line': 0L,
@@ -5591,7 +5590,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'sel-line-start': 21214L,
                                 'selection_end': 21230L,
                                 'selection_start': 21226L})],
-        'has-focus': False,
+        'has-focus': True,
         'locked': False},
         [loc('plugin.py'),
          loc('PlayStream.py'),
@@ -5606,19 +5605,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/SourceBase.py'),
          loc('util.py'),
          loc('sources/viaplay.py')]),
-                               'open_files': [u'PlayStream.py',
-        u'playstreamproxy.py',
+                               'open_files': [u'playstreamproxy.py',
         u'plugin.py',
         u'resolver.py',
         u'resolvers/hqqresolver.py',
         u'sources/SourceBase.py',
+        u'sources/filmix.py',
         u'sources/iplayer.py',
         u'sources/movieplace.py',
         u'sources/replay.py',
         u'sources/viaplay.py',
-        u'sources/filmix.py',
         u'util.py',
-        u'ContentSources.py']},
+        u'ContentSources.py',
+        u'PlayStream.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.3093198992443325},
         'splits': 2,
@@ -5633,11 +5632,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          52,
                          2408,
                          1390)}]}
-guimgr.recent-documents = [loc('ContentSources.py'),
+guimgr.recent-documents = [loc('PlayStream.py'),
+                           loc('ContentSources.py'),
                            loc('util.py'),
                            loc('sources/filmix.py'),
                            loc('sources/movieplace.py'),
-                           loc('PlayStream.py'),
                            loc('sources/viaplay.py'),
                            loc('resolver.py'),
                            loc('resolvers/hqqresolver.py'),
@@ -6395,7 +6394,7 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 0L,
         'selection_end': 0L,
         'selection_start': 0L},
-                       loc('../../../../Python27/Lib/BaseHTTPServer.py'): {'a'\
+                       loc('../../../../Python27/lib/BaseHTTPServer.py'): {'a'\
         'ttrib-starts': [('BaseHTTPRequestHandler',
                           113),
                          ('BaseHTTPRequestHandler.handle_one_request',
@@ -6406,7 +6405,7 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 12434,
         'selection_end': 12434,
         'selection_start': 12434},
-                       loc('../../../../Python27/Lib/base64.py'): {'attrib-s'\
+                       loc('../../../../Python27/lib/base64.py'): {'attrib-s'\
         'tarts': [('b64decode',
                    58)],
         'first-line': 54,
@@ -6415,7 +6414,7 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 2478,
         'selection_end': 2478,
         'selection_start': 2478},
-                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
+                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
         's': [('findall',
                172)],
         'first-line': 162,
@@ -6424,19 +6423,6 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 8708,
         'selection_end': 8708,
         'selection_start': 8708},
-                       loc('../../../../Python27/Lib/site.py'): {'attrib-sta'\
-        'rts': [('setquit',
-                 333),
-                ('setquit.Quitter',
-                 347),
-                ('setquit.Quitter.__call__',
-                 352)],
-        'first-line': 342,
-        'folded-linenos': [],
-        'sel-line': 359,
-        'sel-line-start': 12399,
-        'selection_end': 12399,
-        'selection_start': 12399},
                        loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 24,
@@ -6475,7 +6461,20 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line': 55,
         'sel-line-start': 2762,
         'selection_end': 2762,
-        'selection_start': 2762}}
+        'selection_start': 2762},
+                       loc('../../../../Python27/lib/site.py'): {'attrib-sta'\
+        'rts': [('setquit',
+                 333),
+                ('setquit.Quitter',
+                 347),
+                ('setquit.Quitter.__call__',
+                 352)],
+        'first-line': 342,
+        'folded-linenos': [],
+        'sel-line': 359,
+        'sel-line-start': 12399,
+        'selection_end': 12399,
+        'selection_start': 12399}}
 proj.build-cmd = {None: ('default',
                          None)}
 proj.default-encoding = 'utf_8'
@@ -6486,32 +6485,33 @@ proj.pyexec = {None: ('custom',
 proj.pypath = {None: ('custom',
                       [u'c:\\Data\\Programming\\enigma2\\python',
                        u''])}
-search.replace-history = [u'movieplace',
+search.replace-history = [u'config.pluginss.playstream.',
+                          u'movieplace',
                           u'https://filmix\\.me',
                           u'https://filmix.me/',
                           u'filmix.me',
                           u'self',
                           u'current']
-search.search-history = [u'urlp',
+search.search-history = [u'yesno',
+                         u'LocationBox',
+                         u'TMPDIR',
+                         u'def Canc',
+                         u'ConfigSubDict',
+                         u'config.plugins.playstream.',
+                         u'config.pluginss.playstream.',
+                         u'config.playstream.',
+                         u'config.',
+                         u'select_download_dir',
+                         u'playstream',
+                         u'tmpdir',
+                         u'exit',
+                         u'config.playstream.download_dir',
+                         u'tmp',
+                         u'urlp',
                          u'88',
                          u'localhost',
                          u'stream = ',
-                         u'get_streams',
-                         u'resolve',
-                         u'util',
-                         u'streamproxy_encode',
-                         u'proxy',
-                         u'make_service',
-                         u'surl',
-                         u'options_',
-                         u'options_read',
-                         u'options_screen',
-                         u'options',
-                         u'?',
-                         u'play',
-                         u'eServiceReference',
-                         u'kinofilmnet',
-                         u'_substi']
+                         u'get_streams']
 testing.stored-results = (1,
                           [],
                           {})

changelog.md

@@ -1,12 +1,17 @@
+
+**0.5t** (19.01.2016):
+- Konfigurācijas logs, tmp folder uzdošana, opcija notīrīt tmp folderi pie iziešanas
+- Sīki labojumi
+
+**0.5s** (17.01.2016):
+- koda refaktorings/houskeepings
+
 **0.5p** (15.01.2016):
 - movieplace.lv saturs (daļēji, nav meklēšanas, seariālu, ne visi video hostingi,)
 - hqq hostētus strīmus spēlē ar stream_type=5002 (ja ir exteplayer3) + proxy, jo gstreamrim ir problēmas
 - kodik, kapnob resolveri priekš movieplace.lv
 - u.c. labojumi
 
-**0.5s** (17.01.2016):
-- koda refaktorings/houskeepings
-
 **0.5n** (15.01.2016):
 - salabots filmix (tagad filmix.me)
 - .ts strīmus spēlē ar service_type = 1 (nevis 4097)

resolver.py

@@ -52,9 +52,6 @@ for module in os.listdir(os.path.join(os.path.dirname(__file__), server_path)):
     del module
 RESOLVERS = sorted(RESOLVERS, key=lambda m: -m.__priority__)
 
-def item():
-    stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
-    return stream0
 
 def resolve(url):
     """

sources/SourceBase.py

@@ -11,10 +11,9 @@ import datetime, re, sys,os
 import requests
 from collections import OrderedDict
 import ConfigParser
+import util
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
-stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
-
 
 class SourceBase(object):
     """Stream source base class"""
@@ -51,7 +50,7 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
         if not self.is_video(data):
             return []
         content = self.get_content(data)
-        stream = stream0
+        stream = util.item()
         stream["name"] = content[0].encode("utf8") if isinstance(content[0],unicode) else content[0]
         stream["url"] = content[1].encode("utf8") if isinstance(content[1],unicode) else content[1]
         stream["img"] = content[2].encode("utf8") if isinstance(content[2],unicode) else content[2]

sources/ltc.py

@@ -13,7 +13,7 @@ import datetime
 import HTMLParser
 import json
 import datetime
-from SourceBase import SourceBase, stream_type, stream0
+from SourceBase import SourceBase, stream_type
 import util
 from collections import OrderedDict
 

sources/replay.py

@@ -13,6 +13,7 @@ except:
 import urllib2, urllib
 import datetime, re, sys
 from SourceBase import SourceBase
+import util
 
 API_URL = 'http://replay.lsm.lv/%s/'
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
@@ -22,53 +23,53 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
 import HTMLParser
 h = HTMLParser.HTMLParser()
 from YouTubeVideoUrl import YouTubeVideoUrl
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self,country="lv"):
         self.name = "replay"
         self.title = "Replay.lv (LTV)"
         self.img = "http://replay.lsm.lv/apple-touch-icon.png"
         self.desc = "LSM replay.lv satura skatīšanās"
-        
+
         self.country=country
         self.pic_size = "327x250" #"1000x765"
-        
+
     def get_content(self, data):
         print "[replay] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
         qs = dict(map(lambda x:x.split("="),re.findall("\w+=\w+",params)))
         lang = qs["lang"] if "lang" in qs else self.country
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         if clist=="home":
             content.extend([
                 ("Live streams", "replay::tiesraide","","TV live streams"),
-                ("Search LV", "replay::search/?term={0}&lang=lv","","Search content LV"),                
+                ("Search LV", "replay::search/?term={0}&lang=lv","","Search content LV"),
                 ("Last videos LV", "replay::visi/jaunakie/?source=ltv&lang=lv","","Last aired videos LV"),
-                ("Last videos by categories LV", "replay::kategorijas/?lang=lv","","Last videos by categories LV"),                
+                ("Last videos by categories LV", "replay::kategorijas/?lang=lv","","Last videos by categories LV"),
                 ("All programs LV", "replay::raidijumi/?type=video","","All programs by name LV"),
                 ("Programs by categories LV", "replay::categories?lang=lv","","All programs by categories LV"),
                 #("Channels", "replay::channels?language=%s"%self.country,"","TV channels"),
-                ("Videos by popularity LV", "replay::visi/popularie/?source=ltv&lang=lv","","Programs by popularity"), 
-                
-                ("Search RU", "replay::search/?term={0}&lang=ru","","Search content RU"),                
+                ("Videos by popularity LV", "replay::visi/popularie/?source=ltv&lang=lv","","Programs by popularity"),
+
+                ("Search RU", "replay::search/?term={0}&lang=ru","","Search content RU"),
                 ("Last videos RU", "replay::vse/novie/?source=ltv&lang=ru","","Last aired videos RU"),
-                ("Last videos by categories RU", "replay::kategorijas/?lang=ru","","Last videos by categories RU"),                                
-                ("All programs RU", "replay::peredachi/?lang=ru&type=video","","All programs by name"),         
+                ("Last videos by categories RU", "replay::kategorijas/?lang=ru","","Last videos by categories RU"),
+                ("All programs RU", "replay::peredachi/?lang=ru&type=video","","All programs by name"),
                 ("Programs by categories RU", "replay::categories?lang=ru","","Programs by categories RU")
             ])
             return content
-        
+
         ### programmu kategorijas ###
         elif clist=="categories":
-            url = "http://replay.lsm.lv/lv/raidijumi/?lang=lv&type=video" if lang =="lv" else "http://replay.lsm.lv/ru/peredachi/?lang=ru&type=video"        
+            url = "http://replay.lsm.lv/lv/raidijumi/?lang=lv&type=video" if lang =="lv" else "http://replay.lsm.lv/ru/peredachi/?lang=ru&type=video"
             r = self._http_request(url)
             for item in re.findall(r'<a .+href="(\?lang=\w+&type=video&theme=\d+)">([^<]+)</a>\t', r):
                 title = item[1]
@@ -78,10 +79,10 @@ class Source(SourceBase):
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### jaunāko raidijumu kategorijas ###
         elif clist=="kategorijas":
-            url = "http://replay.lsm.lv/lv/" if lang =="lv" else "http://replay.lsm.lv/ru/"        
+            url = "http://replay.lsm.lv/lv/" if lang =="lv" else "http://replay.lsm.lv/ru/"
             r = self._http_request(url)
             for item in re.findall(r'<a href="/(lv|ru)/kategorija/(\w+)/">.+?<i class="[^"]+"></i>.+?<span>([^<]+)</span>', r, re.DOTALL):
                 title = item[2]
@@ -90,7 +91,7 @@ class Source(SourceBase):
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Tiešraides kanānālu saraksts
         elif path=="tiesraide":
             url = "http://replay.lsm.lv/styles/main.css"
@@ -104,15 +105,15 @@ class Source(SourceBase):
                 desc = title+" tiesraide (%s)"%veids
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Kanāla tiesraide
         elif clist == "tiesraide" and "/" in data:
             ch = data.split('/')[1]
-            veids = "video" if "tv" in ch else "audio"           
+            veids = "video" if "tv" in ch else "audio"
             #url = "http://replay.lsm.lv/lv/tiesraide/ltv7/"
             url = "http://replay.lsm.lv/lv/tiesraide/%s/"%ch
             r= self._http_request(url)
-            
+
             m = re.search('%s/">.+?<h5>([^<]+)+</h5>.*?<time>([^<]+)</time>'%ch, r, re.DOTALL)
             tagad = m.group(1).strip() if m else ""
             laiks = m.group(2).strip() if m else ""
@@ -120,32 +121,32 @@ class Source(SourceBase):
             m = re.search("<h1>([^<]+)</h1>", r)
             title = m.group(1).strip() if m else path.split("/")[1].upper()
             title = "%s - %s (%s)"%(title,tagad,laiks)
-            
+
             if veids == "video":
                 m = re.search('<div class="video"><iframe.+src="([^"]+)"', r)
-                if not m: 
+                if not m:
                     content=("No stream found %s"%data,"","","No stream found")
-                    return content           
+                    return content
                 url = m.group(1)
                 headers = headers2dict("""
             User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
             Referer: http://replay.lsm.lv/lv/ieraksts/ltv/70398/tiesa-runa.-lielbritanija-gatavojas-referendumam-par-tu/
                     """)
                 r = self._http_request(url,headers=headers)
-            
+
                 m = re.search('<div class="video-player"><iframe.+src="([^"]+)"', r)
                 if not m:
                     content=("No stream found %s"%data,"","","No stream found")
                     return content
                 url = m.group(1)
-                            
+
                 r = self._http_request(url,headers=headers)
                 m = re.search('"([^"]+m3u8[^"]+)"', r)
                 if not m:
                     content=("No stream found %s"%data,"","","No stream found")
-                    return content           
+                    return content
                 data2 = m.group(1).replace("\\","")
-                
+
             else: # audio
                 lrn = ch.replace("lr","")
                 url = "http://www.latvijasradio.lsm.lv/lv/tiesraide/?channel=%s"%lrn
@@ -153,24 +154,24 @@ class Source(SourceBase):
                 m = re.search('"file":"([^"]+?m3u8.*?)"', r)
                 if not m:
                     content=("No stream found %s"%data,"","","No stream found")
-                    return content           
+                    return content
                 data2 = m.group(1).replace("\\","")
-                
+
             img = ""
             desc = ""
             content =(title,data2,img,desc)
-            return content           
-                       
+            return content
+
         #m = re.search(r'(\?page=\d+)" class=" paging__prev', r, re.IGNORECASE)
         #if m:
         #    data = re.sub("\?page=\d+", "", data)
         #    data2 = data+m.group(1)
-        #    content.append(("Previous page",self.name+"::"+data2,"","Previous page"))                            
-        
+        #    content.append(("Previous page",self.name+"::"+data2,"","Previous page"))
+
         r = self.call(data, lang=lang)
         if not r:
             return content
-        
+
         if clist == "search":
             #for r2 in re.findall('<article itemtype="http://schema.org/Article" itemscope class="thumbnail thumbnail--default ">(.+?)</article>', r2, re.DOTALL):
             for item in re.findall('itemprop="image" data-image="([^"]+)".+?<figcaption><h5 itemprop="name"><a itemprop="url" href="([^<]+)">([^<]+)</a></h5></figcaption>', r):
@@ -179,16 +180,16 @@ class Source(SourceBase):
                 img = "http://replay.lsm.lv" + item[0]
                 desc  = title
                 content.append((title,self.name+"::"+data2,img,desc))
-                
+
             #for item in re.findall('itemprop="image" data-image="([^"]+)".+?<figcaption><h4 itemprop="about"><a href="([^"]+)">([^<]+)</a></h4>.*?<h5 itemprop="name"><a itemprop="url" href="([^"]+)">([^<]+)</a></h5>.+?datetime="([^"]+)" class="thumbnail__date ">([^<]+)</time>', r2):
-            for item in re.findall('itemprop="image" data-image="([^"]+)".+? class="icon-(ltv|lr).+?<figcaption><h4 itemprop="about"><a href="([^"]+)">([^<]+)</a></h4>.*?<h5 itemprop="name"><a itemprop="url" href="([^"]+)">([^<]+)</a></h5>.+?datetime="([^"]+)" class="thumbnail__date ">([^<]+)</time>', r):  
+            for item in re.findall('itemprop="image" data-image="([^"]+)".+? class="icon-(ltv|lr).+?<figcaption><h4 itemprop="about"><a href="([^"]+)">([^<]+)</a></h4>.*?<h5 itemprop="name"><a itemprop="url" href="([^"]+)">([^<]+)</a></h5>.+?datetime="([^"]+)" class="thumbnail__date ">([^<]+)</time>', r):
                 if item[1]=="lr":continue
                 title = "%s - %s (%s)"%(item[3],item[5],item[7])
                 data2 = item[4].replace("/%s/"%lang,"")+"?lang=%s"%lang
                 img = item[0].replace("https:","http:")
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
-    
+
         ### Raidijumi (programmas) ###
         elif clist in ( "raidijumi","peredachi"):
             for item in re.findall('<li itemprop="name"><a href="([^"]+)" itemprop="url">([^<]+)', r):
@@ -198,7 +199,7 @@ class Source(SourceBase):
                 img = ""
                 desc  = ""
                 content.append((title,self.name+"::"+data2,img,desc))
-                 
+
         ### Raidijuma ieraksti speciālie###
         elif clist in ( "visi","vse",):
             for item in re.findall('(?i)<figure><a href="([^"]+)" itemprop="image" data-image="([^"]+)".+class="thumbnail__duration">([^<]+)</time></figure><figcaption><h4 itemprop="about"><a href="[^"]+">([^<]+)</a></h4>.+>([^<]+).*</h5>.+>([^<]+)</time></figcaption>', r):
@@ -207,16 +208,16 @@ class Source(SourceBase):
                 img = item[1].replace("https:","http:")
                 desc  = "%s - %s\n%s"%(item[5],item[2],item[4])
                 content.append((title,self.name+"::"+data2,img,desc))
-                
+
         ### Raidijuma ieraksti (videos)
-        elif clist in ("raidijums","peredacha","kategorija"): 
+        elif clist in ("raidijums","peredacha","kategorija"):
             for item in re.findall('<article .+ href="([^"]+)".+image="([^"]+)".+class="thumbnail__duration">([^<]+).+">([^<]+).+class="thumbnail__date ">([^"]+)</time></figcaption></article>', r):
                 title = item[3]
                 data2 = item[0].replace("/%s/"%lang,"")+"?lang=%s"%lang
                 img = item[1].replace("https:","http:")
                 desc = "%s - %s"%(item[4],item[2])
                 content.append((title,self.name+"::"+data2,img,desc))
-        
+
         ### Ieraksts (video) ###
         elif clist in ("ieraksts","statja"):
             m = re.search('src="([^"]+)"></iframe>', r)
@@ -230,7 +231,7 @@ Referer: http://replay.lsm.lv/lv/ieraksts/ltv/70398/tiesa-runa.-lielbritanija-ga
                 m = re.search('"file":"([^"]+)', r2)
                 if m:
                     data2 = m.group(1).replace("\\","")
-                    m = re.search('"idstring":"([^"]+)', r2)                    
+                    m = re.search('"idstring":"([^"]+)', r2)
                     title = m.group(1) if m else ""
                     title = title.decode("unicode-escape").encode("utf8")
                     title = title.replace("\n","")
@@ -241,12 +242,12 @@ Referer: http://replay.lsm.lv/lv/ieraksts/ltv/70398/tiesa-runa.-lielbritanija-ga
                         data2 = YouTubeVideoUrl().extract(video_id)
                         if not data2:
                             content=("No stream found %s"%data,"","","No stream found")
-                            return content                           
+                            return content
                     content =(title,data2,img,desc)
                     return content
             content=("No stream found %s"%data,"","","No stream found")
             return content
-                
+
         m = re.search(r'href="\?([^"]+)" class=" paging__next', r)
         if m:
             page = int(re.search("page=(\d+)",m.group(1)).group(1))
@@ -257,10 +258,10 @@ Referer: http://replay.lsm.lv/lv/ieraksts/ltv/70398/tiesa-runa.-lielbritanija-ga
                     data2 =data+"&page=%i"%page
                 else:
                     data2 =data+"?page=%i"%page
-            content.append(("Next page",self.name+"::"+data2,"","Next page"))                            
-                
+            content.append(("Next page",self.name+"::"+data2,"","Next page"))
+
         return content
-    
+
     def is_video(self,data):
         if "::" in data:
             data = data.split("::")[1]
@@ -271,7 +272,7 @@ Referer: http://replay.lsm.lv/lv/ieraksts/ltv/70398/tiesa-runa.-lielbritanija-ga
             return True
         else:
             return False
-    
+
     def call(self, data,headers=headers0,lang=""):
         if not lang: lang = self.country
         url = API_URL%lang + data