palabots

Contents/Code/__init__.py

 except:
     pass
 
-VERSION = "0.1.29"
+VERSION = "0.1.33"
 CHANNEL_NAME = "PlayStream"
 PREFIX   = '/video/playstream'
 DEV = True if Platform.MachineIdentifier == 'Unit testing' else False
-REPO_URL = "http://home.blue.lv/files/PlayStream.bundle/"
+REPO_URL = "http://files.blue.lv/PlayStream.bundle/?sort=time&order=asc"
+DOWNLOAD_URL = "http://files.blue.lv/PlayStream.bundle/"
 ART = "art-default.jpg"
 ICON = "icon-default.png"
 BACK = "back.png"
 
 sources_directory = os.path.join(os.path.dirname(inspect.getsourcefile(content)), "sources")
 use_streams_file_remote = Prefs["general_use_streams_file_remote"]
-if Prefs["general_use_streams_file_remote"]:
-    try:
-        sources = ContentSources(sources_directory, Prefs["general_streams_file_remote"])
-    except:
-        Log("Can not open remote streams file, fallback to local")
-        sources = ContentSources(sources_directory, Prefs["general_streams_file"])
+streams_file = Prefs["general_streams_file"]
+streams_file_remote =  Prefs["general_streams_file_remote"]
+
+Log("[playstream] Create sources objects")
+if use_streams_file_remote:
+    cfg_file = streams_file_remote
+    cfg_file2 = streams_file
 else:
-    sources = ContentSources(sources_directory, Prefs["general_streams_file"])
+    cfg_file = streams_file
+    cfg_file2 = None
+try:
+    sources = ContentSources(sources_directory, cfg_file, cfg_file2)
+except Exception as e:
+    Log(traceback.format_exc())
+
 cfg = sources.plugins["config"]
+Log("[playstream] Using streams_file=%s"% cfg.streams_file)
+ObjectContainer(header="Info", message="Using streams_file %s, reload plugin" % cfg.streams_file)
+
 data0 = None
 title0 = None
 history = []
         ver = get_repo_version()
         #return ObjectContainer(header="Error", message="ver=" % ver)
     fname = "PlayStream.bundle-%s.zip" % ver
-    url = REPO_URL + fname
+    url = DOWNLOAD_URL + fname
     path = os.path.join(tmp_dir, fname)
     try:
         urllib.urlretrieve(url, path)
+        with zipfile.ZipFile(path,"r") as zip_ref:
+            zip_ref.extractall(plugins_dir)
     except:
         return ObjectContainer(header="Error", message="Can not download \n%s" % url)
-    with zipfile.ZipFile(path,"r") as zip_ref:
-        zip_ref.extractall(plugins_dir)
     return ObjectContainer(header="Info", message="Plugin version updated to %s, reload plugin" % ver)
 
 def get_repo_version():
-    r = requests.get(REPO_URL)
-    if r.status_code <> 200:
-        raise Exception("Can not reach repo")
-    vers = re.findall('href="PlayStream\.bundle-(\d+\.\d+\.\d+)\.zip"', r.content)
-    #vers.sort(reverse=True)
-    repo_version = vers[-1]
-    return repo_version
+    try:
+        r = requests.get(REPO_URL)
+        if r.status_code <> 200:
+            Log("[playstream] Can not reach repo")
+            return ""
+        vers = re.findall('href=".*PlayStream\.bundle-(\d+\.\d+\.\d+)\.zip"', r.content)
+        #vers.sort(reverse=True)
+        repo_version = vers[-1] if vers else 0
+        return repo_version
+    except:
+        Log("[playstream] Can not reach repo")
+        return ""
+
 
 def thumb_data(img, video=False):
     default =  R(VIDEO) if video else R(FOLDER)

Contents/VERSION

-0.1.28
+0.1.33

changelog.md

+**0.1.32** (26.01.2019  )
+- [fix] salabots pēc servera crasha
+
+**0.1.31** (23.12.2018)
+- [fix] salabots tvplay, filmix
+
+**0.1.30** (08.11.2018)
+- [bugfix] Papildināts lmt (delfi video)
+
 **0.1.28** (12.10.2018)
 - [bugfix] Salabots replay
 

project.wpr

                                        (u'config::home',
         ''))}
 [user attributes]
-debug.breakpoints = {loc('Contents/Code/__init__.py'): {176L: (0,
+debug.breakpoints = {loc('Contents/Code/__init__.py'): {187L: (0,
         None,
         1,
         0),
-        184L: (0,
+        195L: (0,
                None,
                1,
                0),
-        211L: (0,
+        222L: (0,
                None,
                1,
                0),
-        212L: (0,
+        223L: (0,
                None,
                1,
                0),
-        302L: (0,
+        313L: (0,
                None,
                1,
                0)},
         'tree-states': {'deep': {'expanded-nodes': [(1,),
         (1,
          0),
-        (15,)],
+        (17,)],
                                  'selected-nodes': [(1,
         0,
         0)],
         'top-node': [('generic attribute',
                       loc('../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
                       'ALL_INVOKE_TYPES')]},
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
         loc('unknown:<untitled> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
         'current_pages': [3,
                           1],
         'notebook_display': 'normal',
-        'notebook_percent': 0.399519615692554,
+        'notebook_percent': 0.15852682145716568,
         'override_title': None,
         'pagelist': [('debug-breakpoints',
                       'wide',
                                        'fRegexFlags': 42,
                                        'fReplaceText': u'REPO_URL',
                                        'fReverse': False,
-                                       'fSearchText': u'rais',
+                                       'fSearchText': u'repo',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
                        'history': {},
                        'launch-id': None,
                        'sel-line': 2L,
-                       'sel-line-start': 174L,
-                       'selection_end': 174L,
-                       'selection_start': 174L,
+                       'sel-line-start': 163L,
+                       'selection_end': 163L,
+                       'selection_start': 163L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
                                       'top-node': (0,)}})],
         'primary_view_state': {'editor_states': ('horizontal',
         1.0,
-        ({'bookmarks': ([[loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                          {'attrib-starts': [('Source',
-        31),
-        ('Source.__init__',
-         33)],
-                           'first-line': 37L,
+        ({'bookmarks': ([[loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [('UpdatePlugin',
+        333)],
+                           'first-line': 315L,
                            'folded-linenos': [],
-                           'sel-line': 48L,
-                           'sel-line-start': 1665L,
-                           'selection_end': 1686L,
-                           'selection_start': 1673L,
+                           'sel-line': 337L,
+                           'sel-line-start': 12655L,
+                           'selection_end': 12685L,
+                           'selection_start': 12669L,
                            'zoom': 0L},
-                          1536084222.996],
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                          {'attrib-starts': [('Source',
-        31),
-        ('Source.get_content',
-         56)],
-                           'first-line': 46L,
+                          1548517999.489],
+                         [loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [('get_repo_version',
+        350)],
+                           'first-line': 337L,
                            'folded-linenos': [],
-                           'sel-line': 58L,
-                           'sel-line-start': 2048L,
-                           'selection_end': 2069L,
-                           'selection_start': 2056L,
+                           'sel-line': 358L,
+                           'sel-line-start': 13522L,
+                           'selection_end': 13568L,
+                           'selection_start': 13568L,
                            'zoom': 0L},
-                          1536084225.402],
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                          {'attrib-starts': [('Source',
-        31),
-        ('Source.__init__',
-         33)],
-                           'first-line': 37L,
+                          1548518146.443],
+                         [loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [],
+                           'first-line': 14L,
                            'folded-linenos': [],
-                           'sel-line': 48L,
-                           'sel-line-start': 1665L,
-                           'selection_end': 1686L,
-                           'selection_start': 1673L,
+                           'sel-line': 19L,
+                           'sel-line-start': 463L,
+                           'selection_end': 468L,
+                           'selection_start': 463L,
                            'zoom': 0L},
-                          1536084227.098],
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                          {'attrib-starts': [('Source',
-        31),
-        ('Source.get_content',
-         56)],
-                           'first-line': 46L,
+                          1548518147.164],
+                         [loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [],
+                           'first-line': 14L,
                            'folded-linenos': [],
-                           'sel-line': 58L,
-                           'sel-line-start': 2048L,
-                           'selection_end': 2069L,
-                           'selection_start': 2056L,
+                           'sel-line': 19L,
+                           'sel-line-start': 463L,
+                           'selection_end': 478L,
+                           'selection_start': 473L,
                            'zoom': 0L},
-                          1536084236.843],
+                          1548518147.555],
                          [loc('Contents/Code/__init__.py'),
                           {'attrib-starts': [('Menu',
-        134)],
-                           'first-line': 343L,
+        144)],
+                           'first-line': 279L,
                            'folded-linenos': [],
-                           'sel-line': 221L,
-                           'sel-line-start': 8453L,
-                           'selection_end': 8500L,
-                           'selection_start': 8500L,
+                           'sel-line': 301L,
+                           'sel-line-start': 11425L,
+                           'selection_end': 11455L,
+                           'selection_start': 11450L,
                            'zoom': 0L},
-                          1536084239.931],
+                          1548518148.255],
                          [loc('Contents/Code/__init__.py'),
-                          {'attrib-starts': [],
-                           'first-line': 31L,
+                          {'attrib-starts': [('Menu',
+        144)],
+                           'first-line': 286L,
                            'folded-linenos': [],
-                           'sel-line': 43L,
-                           'sel-line-start': 1333L,
-                           'selection_end': 1357L,
-                           'selection_start': 1354L,
+                           'sel-line': 308L,
+                           'sel-line-start': 11648L,
+                           'selection_end': 11672L,
+                           'selection_start': 11667L,
                            'zoom': 0L},
-                          1536084240.066],
+                          1548518149.319],
                          [loc('Contents/Code/__init__.py'),
                           {'attrib-starts': [('Menu',
-        134)],
-                           'first-line': 206L,
+        144)],
+                           'first-line': 298L,
                            'folded-linenos': [],
-                           'sel-line': 224L,
-                           'sel-line-start': 8591L,
-                           'selection_end': 8617L,
-                           'selection_start': 8615L,
+                           'sel-line': 312L,
+                           'sel-line-start': 11814L,
+                           'selection_end': 11844L,
+                           'selection_start': 11839L,
                            'zoom': 0L},
-                          1536084240.178],
+                          1548518150.293],
                          [loc('Contents/Code/__init__.py'),
                           {'attrib-starts': [('Menu',
-        134)],
-                           'first-line': 206L,
+        144)],
+                           'first-line': 298L,
                            'folded-linenos': [],
-                           'sel-line': 221L,
-                           'sel-line-start': 8453L,
-                           'selection_end': 8505L,
-                           'selection_start': 8504L,
+                           'sel-line': 314L,
+                           'sel-line-start': 11879L,
+                           'selection_end': 11906L,
+                           'selection_start': 11901L,
                            'zoom': 0L},
-                          1536084242.377],
+                          1548518150.958],
                          [loc('Contents/Code/__init__.py'),
                           {'attrib-starts': [('Menu',
-        134)],
-                           'first-line': 282L,
+        144)],
+                           'first-line': 298L,
                            'folded-linenos': [],
-                           'sel-line': 300L,
-                           'sel-line-start': 11687L,
-                           'selection_end': 11732L,
-                           'selection_start': 11725L,
+                           'sel-line': 315L,
+                           'sel-line-start': 11911L,
+                           'selection_end': 11952L,
+                           'selection_start': 11947L,
                            'zoom': 0L},
-                          1536084244.802],
+                          1548518151.379],
                          [loc('Contents/Code/__init__.py'),
-                          {'attrib-starts': [],
-                           'first-line': 50L,
+                          {'attrib-starts': [('Menu',
+        144)],
+                           'first-line': 298L,
                            'folded-linenos': [],
-                           'sel-line': 67L,
-                           'sel-line-start': 2333L,
-                           'selection_end': 2367L,
-                           'selection_start': 2359L,
+                           'sel-line': 315L,
+                           'sel-line-start': 11911L,
+                           'selection_end': 11978L,
+                           'selection_start': 11973L,
                            'zoom': 0L},
-                          1536084263.038],
+                          1548518151.776],
                          [loc('Contents/Code/__init__.py'),
-                          {'attrib-starts': [('ValidatePrefs',
-        89)],
-                           'first-line': 83L,
+                          {'attrib-starts': [('Menu',
+        144)],
+                           'first-line': 298L,
                            'folded-linenos': [],
-                           'sel-line': 101L,
-                           'sel-line-start': 3693L,
-                           'selection_end': 3750L,
-                           'selection_start': 3743L,
+                           'sel-line': 320L,
+                           'sel-line-start': 12013L,
+                           'selection_end': 12035L,
+                           'selection_start': 12030L,
                            'zoom': 0L},
-                          1536084324.408],
+                          1548518152.204],
                          [loc('Contents/Code/__init__.py'),
                           {'attrib-starts': [],
-                           'first-line': 62L,
+                           'first-line': 9L,
                            'folded-linenos': [],
-                           'sel-line': 67L,
-                           'sel-line-start': 2333L,
-                           'selection_end': 2367L,
-                           'selection_start': 2359L,
+                           'sel-line': 11L,
+                           'sel-line-start': 243L,
+                           'selection_end': 251L,
+                           'selection_start': 243L,
                            'zoom': 0L},
-                          1536084325.886],
+                          1548518724.538],
                          [loc('Contents/Code/__init__.py'),
-                          {'attrib-starts': [],
-                           'first-line': 75L,
+                          {'attrib-starts': [('UpdatePlugin',
+        333)],
+                           'first-line': 319L,
                            'folded-linenos': [],
-                           'sel-line': 10L,
-                           'sel-line-start': 172L,
-                           'selection_end': 182L,
-                           'selection_start': 178L,
+                           'sel-line': 340L,
+                           'sel-line-start': 12826L,
+                           'selection_end': 12844L,
+                           'selection_start': 12836L,
                            'zoom': 0L},
-                          1536084449.82],
+                          1548518725.725],
                          [loc('Contents/Code/__init__.py'),
-                          {'attrib-starts': [],
-                           'first-line': 62L,
+                          {'attrib-starts': [('get_repo_version',
+        350)],
+                           'first-line': 331L,
                            'folded-linenos': [],
-                           'sel-line': 67L,
-                           'sel-line-start': 2333L,
-                           'selection_end': 2367L,
-                           'selection_start': 2359L,
+                           'sel-line': 352L,
+                           'sel-line-start': 13274L,
+                           'selection_end': 13307L,
+                           'selection_start': 13299L,
                            'zoom': 0L},
-                          1536084451.309],
+                          1548518726.723],
                          [loc('Contents/Code/__init__.py'),
-                          {'attrib-starts': [('ValidatePrefs',
-        89)],
-                           'first-line': 83L,
+                          {'attrib-starts': [],
+                           'first-line': 6L,
                            'folded-linenos': [],
-                           'sel-line': 99L,
-                           'sel-line-start': 3635L,
-                           'selection_end': 3670L,
-                           'selection_start': 3665L,
+                           'sel-line': 11L,
+                           'sel-line-start': 243L,
+                           'selection_end': 251L,
+                           'selection_start': 243L,
                            'zoom': 0L},
-                          1536084482.223],
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                          {'attrib-starts': [('Source',
-        31),
-        ('Source.get_content',
-         56)],
-                           'first-line': 40L,
+                          1548518727.701],
+                         [loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [('UpdatePlugin',
+        333)],
+                           'first-line': 319L,
                            'folded-linenos': [],
-                           'sel-line': 68L,
-                           'sel-line-start': 2506L,
-                           'selection_end': 2545L,
-                           'selection_start': 2545L,
+                           'sel-line': 340L,
+                           'sel-line-start': 12826L,
+                           'selection_end': 12844L,
+                           'selection_start': 12836L,
                            'zoom': 0L},
-                          1536085986.221],
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                          {'attrib-starts': [('Source',
-        31),
-        ('Source.get_streams',
-         125)],
-                           'first-line': 133L,
+                          1548518734.23],
+                         [loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [('get_repo_version',
+        350)],
+                           'first-line': 337L,
                            'folded-linenos': [],
-                           'sel-line': 145L,
-                           'sel-line-start': 5620L,
-                           'selection_end': 5636L,
-                           'selection_start': 5632L,
+                           'sel-line': 352L,
+                           'sel-line-start': 13274L,
+                           'selection_end': 13307L,
+                           'selection_start': 13299L,
                            'zoom': 0L},
-                          1536085990.308],
+                          1548518737.533],
                          [loc('Contents/Code/__init__.py'),
-                          {'attrib-starts': [('ValidatePrefs',
-        89)],
-                           'first-line': 83L,
+                          {'attrib-starts': [],
+                           'first-line': 6L,
                            'folded-linenos': [],
-                           'sel-line': 99L,
-                           'sel-line-start': 3635L,
-                           'selection_end': 3670L,
-                           'selection_start': 3665L,
+                           'sel-line': 12L,
+                           'sel-line-start': 317L,
+                           'selection_end': 325L,
+                           'selection_start': 325L,
                            'zoom': 0L},
-                          1536086169.267],
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                          {'attrib-starts': [('Source',
-        31),
-        ('Source.get_content',
-         56)],
-                           'first-line': 52L,
+                          1548518753.289],
+                         [loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [('Menu',
+        145)],
+                           'first-line': 286L,
                            'folded-linenos': [],
-                           'sel-line': 62L,
-                           'sel-line-start': 2248L,
-                           'selection_end': 2248L,
-                           'selection_start': 2248L,
+                           'sel-line': 307L,
+                           'sel-line-start': 11675L,
+                           'selection_end': 11702L,
+                           'selection_start': 11698L,
                            'zoom': 0L},
-                          1536121150.448],
-                         [loc('Contents/Libraries/Shared/content/util.py'),
-                          {'attrib-starts': [('item',
-        362)],
-                           'first-line': 359L,
+                          1548518756.743],
+                         [loc('Contents/Code/__init__.py'),
+                          {'attrib-starts': [('UpdateMenu',
+        322)],
+                           'first-line': 303L,
                            'folded-linenos': [],
-                           'sel-line': 364L,
-                           'sel-line-start': 12687L,
-                           'selection_end': 12702L,
-                           'selection_start': 12702L,
+                           'sel-line': 324L,
+                           'sel-line-start': 12184L,
+                           'selection_end': 12207L,
+                           'selection_start': 12203L,
                            'zoom': 0L},
-                          1536121152.447]],
+                          1548518757.702]],
                         20),
-          'current-loc': loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
+          'current-loc': loc('Contents/Code/__init__.py'),
           'editor-state-list': [(loc('Contents/Code/__init__.py'),
-                                 {'attrib-starts': [('ValidatePrefs',
-        89)],
-                                  'first-line': 83L,
+                                 {'attrib-starts': [],
+                                  'first-line': 0L,
                                   'folded-linenos': [],
-                                  'sel-line': 99L,
-                                  'sel-line-start': 3635L,
-                                  'selection_end': 3670L,
-                                  'selection_start': 3665L,
+                                  'sel-line': 14L,
+                                  'sel-line-start': 369L,
+                                  'selection_end': 372L,
+                                  'selection_start': 372L,
                                   'zoom': 0L}),
                                 (loc('test.py'),
                                  {'attrib-starts': [],
           loc('syspath.py'),
           loc('../../../../Program Files (x86)/Plex/Plex Media Server/Resources/Plug-ins-313f93718/Framework.bundle/Contents/Resources/Versions/2/Python/Framework/components/runtime.py')])),
                                'open_files': [u'Contents/Code/DumbTools.py',
+        u'Contents/Info.plist',
+        u'Contents/Libraries/Shared/content/sources/enigma2.py',
+        u'Contents/Libraries/Shared/content/util.py',
         u'plex_test_case/__init__.py',
         u'plex_test_case/bootstrap.py',
         u'plex_test_case/mock/mock/mock.py',
+        u'plex_test_case/plex.py',
         u'syspath.py',
         u'test.py',
-        u'plex_test_case/plex.py',
-        u'Contents/Info.plist',
         u'Contents/Code/__init__.py',
-        u'Contents/Libraries/Shared/content/util.py',
-        u'Contents/Libraries/Shared/content/sources/enigma2.py',
         u'Contents/Code/__init__.py',
         u'plex_test_case/__init__.py',
         u'plex_test_case/bootstrap.py',
                          0,
                          1541,
                          877)}]}
-guimgr.recent-documents = [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
-                           loc('Contents/Libraries/Shared/content/util.py'),
+guimgr.recent-documents = [loc('test.py'),
                            loc('Contents/Code/__init__.py'),
-                           loc('Contents/Info.plist'),
                            loc('plex_test_case/plex.py'),
-                           loc('test.py'),
-                           loc('plex_test_case/mock/mock/mock.py'),
                            loc('plex_test_case/__init__.py'),
+                           loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
+                           loc('Contents/Libraries/Shared/content/util.py'),
+                           loc('Contents/Info.plist'),
+                           loc('plex_test_case/mock/mock/mock.py'),
                            loc('Contents/Code/DumbTools.py'),
                            loc('plex_test_case/bootstrap.py'),
                            loc('syspath.py')]
                                    'versioncontrol.svn.extra-global-args': '',
                                    'versioncontrol.svn.svnadmin-executable': u'svnadmin'}})
 search.replace-history = [u'REPO_URL']
-search.search-history = [u'options_',
+search.search-history = [u'repo',
+                         u'REPO_URL',
+                         u'updat',
+                         u'get_repo_version',
+                         u'version',
+                         u'get_repo',
+                         u'except',
+                         u'started',
+                         u'options_',
                          u'self.options_',
                          u'HTTPLiveStreamURL',
                          u'stream',
                          u'except:',
                          u'"quality"',
                          u'"qu',
-                         u'"qulity"',
-                         u'bitrate',
-                         u'item["',
-                         u'item["qual',
-                         u'(o',
-                         u'CHANNEL_NAME',
-                         u'title',
-                         u'title2=',
-                         u'title2']
+                         u'"qulity"']
 testing.stored-results = (1,
                           [],
                           {})

restart.ps1

-Stop-Process -force -processname "Plex*"
+#Stop-Process -force -processname "Plex*"
 Start-Process -FilePath "C:\Program Files (x86)\Plex\Plex Media Server\Plex Media Server.exe"