replay salabots

project.wpr

@@ -822,18 +822,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'top-node': [('generic attribute',
                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
                       'ADAPTIVE')]},
-        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -970,18 +970,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 10L,
+                       'first-line': 21L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/replay.py': ['h'\
-        'eaders\n',
-        'url\n',
-        'print url\n',
-        'print\n']},
+                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/replay.py': ['d'\
+        'ata\n',
+        'url3\n',
+        'headers\n',
+        'raise \n',
+        'ex\n',
+        'm.group(1)\n']},
                        'launch-id': None,
-                       'sel-line': 19L,
-                       'sel-line-start': 688L,
-                       'selection_end': 688L,
-                       'selection_start': 688L,
+                       'sel-line': 26L,
+                       'sel-line-start': 1810L,
+                       'selection_end': 1810L,
+                       'selection_start': 1810L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -1034,66 +1036,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                             31),
                            ('Source.get_content',
                             56)],
-         'first-line': 133L,
+         'first-line': 146L,
          'folded-linenos': [],
-         'sel-line': 138L,
-         'sel-line-start': 5619L,
-         'selection_end': 5654L,
-         'selection_start': 5652L,
+         'sel-line': 154L,
+         'sel-line-start': 6516L,
+         'selection_end': 6565L,
+         'selection_start': 6560L,
          'zoom': 0L},
-        1530209521.984],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 133L,
-          'folded-linenos': [],
-          'sel-line': 138L,
-          'sel-line-start': 5619L,
-          'selection_end': 5646L,
-          'selection_start': 5645L,
-          'zoom': 0L},
-         1530209524.614],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 140L,
-          'folded-linenos': [],
-          'sel-line': 148L,
-          'sel-line-start': 6116L,
-          'selection_end': 6145L,
-          'selection_start': 6140L,
-          'zoom': 0L},
-         1530209531.547],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 140L,
-          'folded-linenos': [],
-          'sel-line': 148L,
-          'sel-line-start': 6116L,
-          'selection_end': 6153L,
-          'selection_start': 6148L,
-          'zoom': 0L},
-         1530209532.105],
-        [loc('sources/filmix.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 146L,
-          'folded-linenos': [],
-          'sel-line': 154L,
-          'sel-line-start': 6516L,
-          'selection_end': 6565L,
-          'selection_start': 6560L,
-          'zoom': 0L},
-         1530209535.89],
+        1530209535.89],
         [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
                              31),
@@ -1448,9 +1398,81 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'selection_end': 26927L,
           'selection_start': 26926L,
           'zoom': 0L},
-         1530209984.345]],
+         1530209984.345],
+        [loc('sources/ltc.py'),
+         {'attrib-starts': [('Source',
+                             26),
+                            ('Source.get_info2',
+                             930)],
+          'first-line': 934L,
+          'folded-linenos': [132L,
+                             161L,
+                             221L,
+                             232L,
+                             258L,
+                             277L,
+                             296L,
+                             320L,
+                             350L,
+                             351L,
+                             399L,
+                             412L,
+                             532L],
+          'sel-line': 944L,
+          'sel-line-start': 48949L,
+          'selection_end': 48949L,
+          'selection_start': 48949L,
+          'zoom': 0L},
+         1530474479.645],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             31),
+                            ('Source.get_streams',
+                             220)],
+          'first-line': 263L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 268L,
+          'sel-line-start': 13506L,
+          'selection_end': 13506L,
+          'selection_start': 13506L,
+          'zoom': 0L},
+         1530474598.565],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             31),
+                            ('Source.get_streams',
+                             220)],
+          'first-line': 353L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 363L,
+          'sel-line-start': 18452L,
+          'selection_end': 18452L,
+          'selection_start': 18452L,
+          'zoom': 0L},
+         1530474985.762],
+        [loc('sources/SourceBase.py'),
+         {'attrib-starts': [('SourceBase',
+                             32),
+                            ('SourceBase._http_request',
+                             118)],
+          'first-line': 120L,
+          'folded-linenos': [],
+          'sel-line': 128L,
+          'sel-line-start': 4807L,
+          'selection_end': 4807L,
+          'selection_start': 4807L,
+          'zoom': 0L},
+         1530475063.84]],
         20),
-        'current-loc': loc('sources/ltc.py'),
+        'current-loc': loc('sources/replay.py'),
         'editor-state-list': [(loc('run.py'),
                                {'attrib-starts': [('Main',
         22),
@@ -1505,16 +1527,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         31),
         ('Source.get_streams',
          220)],
-                                'first-line': 263L,
+                                'first-line': 356L,
                                 'folded-linenos': [70L,
         89L,
         143L,
         166L,
         284L],
-                                'sel-line': 268L,
-                                'sel-line-start': 13506L,
-                                'selection_end': 13506L,
-                                'selection_start': 13506L,
+                                'sel-line': 363L,
+                                'sel-line-start': 18441L,
+                                'selection_end': 18441L,
+                                'selection_start': 18441L,
                                 'zoom': 0L}),
                               (loc('sources/lmt.py'),
                                {'attrib-starts': [('Source',
@@ -1581,8 +1603,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'sel-line-start': 7404L,
                                 'selection_end': 7404L,
                                 'selection_start': 7404L,
+                                'zoom': 0L}),
+                              (loc('sources/SourceBase.py'),
+                               {'attrib-starts': [('SourceBase',
+        32),
+        ('SourceBase._http_request',
+         118)],
+                                'first-line': 120L,
+                                'folded-linenos': [],
+                                'sel-line': 128L,
+                                'sel-line-start': 4807L,
+                                'selection_end': 4807L,
+                                'selection_start': 4807L,
                                 'zoom': 0L})],
-        'has-focus': True,
+        'has-focus': False,
         'locked': False},
         [loc('run.py'),
          loc('util.py'),
@@ -1593,17 +1627,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/config.py'),
          loc('changelog.md'),
          loc('sources/filmix.py'),
-         loc('sources/filmas.py')]),
+         loc('sources/filmas.py'),
+         loc('sources/SourceBase.py')]),
                                'open_files': [u'changelog.md',
         u'run.py',
         u'sources/config.py',
         u'sources/euronews.py',
-        u'sources/lmt.py',
-        u'util.py',
         u'sources/filmas.py',
-        u'sources/replay.py',
         u'sources/filmix.py',
-        u'sources/ltc.py']},
+        u'sources/lmt.py',
+        u'util.py',
+        u'sources/ltc.py',
+        u'sources/replay.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.47474747474747475},
         'splits': 2,
@@ -1618,11 +1653,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          91,
                          2455,
                          1462)}]}
-guimgr.recent-documents = [loc('sources/ltc.py'),
+guimgr.recent-documents = [loc('sources/replay.py'),
+                           loc('sources/SourceBase.py'),
+                           loc('sources/ltc.py'),
+                           loc('util.py'),
                            loc('sources/filmix.py'),
-                           loc('sources/replay.py'),
                            loc('sources/filmas.py'),
-                           loc('util.py'),
                            loc('run.py'),
                            loc('sources/lmt.py'),
                            loc('changelog.md'),

sources/replay.py

@@ -359,9 +359,11 @@ Referer: https://replay.lsm.lv/%s/%s
                 m = re.search('<div class="video-player">.+?<iframe src="([^"]+)', r2, re.DOTALL)
                 if not m:
                     raise Exception("No stream found")
-                url3 = "https:" + m.group(1)
+                url3 = m.group(1)
                 headers["Referer"] = url2
                 r3 = self._http_request(url3, headers=headers)
+                if not r3:
+                    raise Exception("No stream found")
                 m = re.search(r"src: '([^']+)',\s+?type: 'application/x-mpegurl'", r3, re.DOTALL)
                 if not m:
                     raise Exception("No stream found")