next.png

project.wpr

@@ -78,11 +78,7 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
         None,
         1,
         0),
-        53L: (0,
-              None,
-              1,
-              0),
-        86L: (0,
+        56L: (0,
               None,
               1,
               0),
@@ -90,7 +86,7 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
               None,
               1,
               0),
-        117L: (0,
+        120L: (0,
                None,
                1,
                0)},
@@ -788,18 +784,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'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -936,37 +932,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 219L,
+                       'first-line': 0L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/run.py': ['p'\
-        'rint url\n',
-        'url\n',
-        'params\n'],
-                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/cinemalive.py': ['p'\
-        'rint p0\n',
-        'p\n',
-        'm2\n',
-        'dict(m2.groups())\n',
-        'm2.groups().dict()\n',
-        'm2.groups()\n',
-        'list(m2.groups())\n',
-        'l = list(m2.groups())\n',
-        'l.remove(2)\n',
-        'l.remove("video")\n',
-        'l\n'],
-                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/euronews.py': ['d'\
-        'ata\n',
-        'content\n',
-        'url\n',
-        'print url\n',
-        'r\n',
-        'article["text"]\n',
-        'cmd\n']},
+                       'history': {},
                        'launch-id': None,
-                       'sel-line': 231L,
-                       'sel-line-start': 16224L,
-                       'selection_end': 16245L,
-                       'selection_start': 16224L,
+                       'sel-line': 0L,
+                       'sel-line-start': 0L,
+                       'selection_end': 0L,
+                       'selection_start': 0L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -1012,86 +985,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'selection_end': 174L,
                        'selection_start': 174L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/cinemalive.py'),
-        {'attrib-starts': [('Source',
-                            29),
-                           ('Source.get_streams',
-                            166)],
-         'first-line': 176L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('resolvers/cloudsany.py'),
+        {'attrib-starts': [('resolve',
+                            30)],
+         'first-line': 77L,
          'folded-linenos': [],
-         'sel-line': 184L,
-         'sel-line-start': 9045L,
-         'selection_end': 9087L,
-         'selection_start': 9074L,
+         'sel-line': 85L,
+         'sel-line-start': 2581L,
+         'selection_end': 2619L,
+         'selection_start': 2606L,
          'zoom': 0L},
-        1513038881.367],
-        [loc('resolver.py'),
-         {'attrib-starts': [],
-          'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 0L,
-          'sel-line-start': 0L,
-          'selection_end': 0L,
-          'selection_start': 0L,
-          'zoom': 0L},
-         1513038900.236],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 56L,
-          'folded-linenos': [],
-          'sel-line': 66L,
-          'sel-line-start': 1937L,
-          'selection_end': 1972L,
-          'selection_start': 1972L,
-          'zoom': 0L},
-         1513038911.299],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 77L,
-          'folded-linenos': [],
-          'sel-line': 84L,
-          'sel-line-start': 2550L,
-          'selection_end': 2580L,
-          'selection_start': 2580L,
-          'zoom': 0L},
-         1513038986.051],
-        [loc('sources/cinemalive.py'),
-         {'attrib-starts': [('Source',
-                             29),
-                            ('Source.get_streams',
-                             166)],
-          'first-line': 176L,
-          'folded-linenos': [],
-          'sel-line': 184L,
-          'sel-line-start': 9045L,
-          'selection_end': 9087L,
-          'selection_start': 9074L,
-          'zoom': 0L},
-         1513039022.989],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 77L,
-          'folded-linenos': [],
-          'sel-line': 84L,
-          'sel-line-start': 2550L,
-          'selection_end': 2580L,
-          'selection_start': 2580L,
-          'zoom': 0L},
-         1513039024.31],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 77L,
-          'folded-linenos': [],
-          'sel-line': 85L,
-          'sel-line-start': 2581L,
-          'selection_end': 2619L,
-          'selection_start': 2606L,
-          'zoom': 0L},
-         1513039024.825],
+        1513039024.825],
         [loc('resolvers/cloudsany.py'),
          {'attrib-starts': [('resolve',
                              30)],
@@ -1240,9 +1144,82 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'selection_end': 2834L,
           'selection_start': 2834L,
           'zoom': 0L},
-         1513039884.569]],
+         1513039884.569],
+        [loc('sources/cinemalive.py'),
+         {'attrib-starts': [('Source',
+                             29),
+                            ('Source.get_streams',
+                             166)],
+          'first-line': 176L,
+          'folded-linenos': [],
+          'sel-line': 184L,
+          'sel-line-start': 9045L,
+          'selection_end': 9087L,
+          'selection_start': 9074L,
+          'zoom': 0L},
+         1513039905.096],
+        [loc('resolvers/cloudsany.py'),
+         {'attrib-starts': [('resolve',
+                             30)],
+          'first-line': 81L,
+          'folded-linenos': [],
+          'sel-line': 87L,
+          'sel-line-start': 2699L,
+          'selection_end': 2719L,
+          'selection_start': 2719L,
+          'zoom': 0L},
+         1513041023.607],
+        [loc('sources/euronews.py'),
+         {'attrib-starts': [('Source',
+                             26),
+                            ('Source.get_streams',
+                             150)],
+          'first-line': 168L,
+          'folded-linenos': [],
+          'sel-line': 176L,
+          'sel-line-start': 7974L,
+          'selection_end': 7974L,
+          'selection_start': 7974L,
+          'zoom': 0L},
+         1513041028.021],
+        [loc('sources/euronews.py'),
+         {'attrib-starts': [],
+          'first-line': 302L,
+          'folded-linenos': [],
+          'sel-line': 309L,
+          'sel-line-start': 12837L,
+          'selection_end': 12837L,
+          'selection_start': 12837L,
+          'zoom': 0L},
+         1516202716.441],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.get_content',
+                             64)],
+          'first-line': 80L,
+          'folded-linenos': [],
+          'sel-line': 89L,
+          'sel-line-start': 4016L,
+          'selection_end': 4016L,
+          'selection_start': 4016L,
+          'zoom': 0L},
+         1516202720.157],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.play_video',
+                             242)],
+          'first-line': 255L,
+          'folded-linenos': [],
+          'sel-line': 264L,
+          'sel-line-start': 10415L,
+          'selection_end': 10415L,
+          'selection_start': 10415L,
+          'zoom': 0L},
+         1516203350.279]],
         20),
-        'current-loc': loc('sources/cinemalive.py'),
+        'current-loc': loc('resolvers/cloudsany.py'),
         'editor-state-list': [(loc('ContentSources.py'),
                                {'attrib-starts': [('ContentSources',
         16),
@@ -1366,16 +1343,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 10415L,
                                 'zoom': 0L}),
                               (loc('sources/euronews.py'),
-                               {'attrib-starts': [('Source',
-        26),
-        ('Source.get_streams',
-         150)],
-                                'first-line': 168L,
+                               {'attrib-starts': [],
+                                'first-line': 302L,
                                 'folded-linenos': [],
-                                'sel-line': 176L,
-                                'sel-line-start': 7974L,
-                                'selection_end': 7974L,
-                                'selection_start': 7974L,
+                                'sel-line': 309L,
+                                'sel-line-start': 12837L,
+                                'selection_end': 12837L,
+                                'selection_start': 12837L,
                                 'zoom': 0L}),
                               (loc('sources/filmon.py'),
                                {'attrib-starts': [('Source',
@@ -1401,12 +1375,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                               (loc('resolvers/cloudsany.py'),
                                {'attrib-starts': [('resolve',
         30)],
-                                'first-line': 81L,
+                                'first-line': 41L,
                                 'folded-linenos': [],
-                                'sel-line': 90L,
-                                'sel-line-start': 2808L,
-                                'selection_end': 2834L,
-                                'selection_start': 2834L,
+                                'sel-line': 55L,
+                                'sel-line-start': 1587L,
+                                'selection_end': 1599L,
+                                'selection_start': 1599L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
@@ -1425,21 +1399,21 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/filmon.py'),
          loc('resolver.py'),
          loc('resolvers/cloudsany.py')]),
-                               'open_files': [u'kivy_test.py',
+                               'open_files': [u'Downloader.py',
+        u'kivy_test.py',
+        u'resolver.py',
+        u'sources/cinemalive.py',
         u'sources/filmas.py',
         u'sources/filmix.py',
+        u'sources/filmon.py',
         u'sources/lmt.py',
         u'sources/ltc.py',
         u'sources/replay.py',
         u'util.py',
-        u'Downloader.py',
         u'sources/euronews.py',
         u'ContentSources.py',
-        u'sources/filmon.py',
         u'run.py',
-        u'resolver.py',
-        u'resolvers/cloudsany.py',
-        u'sources/cinemalive.py']},
+        u'resolvers/cloudsany.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.42670046472327844},
         'splits': 2,
@@ -1454,15 +1428,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          -1080,
                          1858,
                          1080)}]}
-guimgr.recent-documents = [loc('sources/cinemalive.py'),
-                           loc('resolvers/cloudsany.py'),
-                           loc('resolver.py'),
+guimgr.recent-documents = [loc('resolvers/cloudsany.py'),
                            loc('run.py'),
-                           loc('sources/filmon.py'),
                            loc('ContentSources.py'),
                            loc('sources/euronews.py'),
-                           loc('Downloader.py'),
                            loc('util.py'),
+                           loc('sources/cinemalive.py'),
+                           loc('resolver.py'),
+                           loc('sources/filmon.py'),
+                           loc('Downloader.py'),
                            loc('sources/filmas.py'),
                            loc('kivy_test.py'),
                            loc('sources/ltc.py'),

resolvers/cloudsany.py

@@ -50,7 +50,10 @@ def resolve(url):
     m = re.search(r"'(https\|.+?jwplayer)'", r)
     if not m:
         print url
-        raise Exception("Can not find stream")
+        if "File was deleted" in r:
+            raise Exception("File was deleted")
+        else:
+            raise Exception("Can not find stream")
 
     p = m.group(1).split("|")
     p0 = m.group(1)

sources/cinemalive.py

@@ -151,7 +151,7 @@ Accept-Language: en-US,en;q=0.8
             m = re.search(r"""<span class="current">\d+</span><a href='https://cinemalive.tv/([^']+)'""", r0)
             if m:
                 data2 = m.group(1)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+                content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
             return content
 
         else:

sources/euronews.py

@@ -135,7 +135,7 @@ Connection: keep-alive
                     content.append((title,self.name+"::"+data2,img,desc))
             if "page=" in data:
                 data2 = re.sub("page=\d+","page=%s"%(int(qs["page"])+1),data)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+                content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
             return content
 
 

sources/filmix.py

@@ -185,7 +185,7 @@ Cookie: FILMIXNET=%s
                         data2 = re.sub("/page/(\d)+", "/page/%s"%page, data)
                     else:
                         data2 = data + "/page/2"
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+                content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
 
             return content
 

sources/iplayer.py

@@ -173,7 +173,7 @@ Connection: Keep-Alive
 
             if "&page=" in data and lst["page"]*lst["per_page"]<lst["count"]:
                 data2 = re.sub("&page=\d+","&page=%s"%(lst["page"]+1),data)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+                content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
             return content
 
         ### A-z root ###

sources/lmt.py

@@ -110,7 +110,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             if m:
                 page = int(m.group(1))+1
                 data2 = re.sub(r"videoPage=\d+", r"videoPage=%s"%page, data)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+                content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
             #print content
             return content
 

sources/movieplace.py

@@ -93,7 +93,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 if m:
                     page = int(m.group(1))+1
                     data2 = re.sub(r"p=\d+", r"p=%s"%page, data)
-                    content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+                    content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
             return content
 
         # Filmu saraksti ##
@@ -119,7 +119,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                     page = int(re.search("\d+$",data).group())
                     page = page+1
                     data2 = re.sub("\d$","%s"%page,data)
-                    content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+                    content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
             return content
 
         ### Seriāls ###