cinemalive strādā gan ar cloudsany gan ar openload

u.c.

project.wpr

@@ -28,16 +28,15 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
         '')),
                       loc('iubx2.py'): ('project',
         (u'-sgr -d 10',
+         '')),
+                      loc('kivy_test.py'): ('project',
+        (u'https://dl4.sanii.co/files/2/60e13omc1cpph2/video.mp4',
          '')),
                       loc('run.py'): ('project',
                                       (u'config::home  streams_bernu.cfg',
                                        ''))}
 [user attributes]
-debug.breakpoints = {loc('ContentSources.py'): {39L: (0,
-        None,
-        1,
-        0)},
-                     loc('iub.py'): {102: (0,
+debug.breakpoints = {loc('iub.py'): {102: (0,
         None,
         1,
         0),
@@ -53,11 +52,11 @@ debug.breakpoints = {loc('ContentSources.py'): {39L: (0,
               None,
               1,
               0)},
-                     loc('sources/cinemalive.py'): {209L: (0,
+                     loc('resolvers/cloudsany.py'): {105L: (0,
         None,
         1,
         0)},
-                     loc('sources/ltc.py'): {101L: (0,
+                     loc('sources/ltc.py'): {102L: (0,
         None,
         1,
         0)},
@@ -152,6 +151,7 @@ debug.recent-run-args = {loc('ContentSources.py'): [u'config::home streams_bernu
         u'-sgr',
         u'--sgr',
         u'--slud'],
+                         loc('kivy_test.py'): [u'https://dl4.sanii.co/files/2/60e13omc1cpph2/video.mp4'],
                          loc('run.py'): [u'config::home  streams_bernu.cfg',
         u'config::home ',
         u'config::home streams_bernu.cfg',
@@ -165,7 +165,7 @@ edit.bookmarks = {'list_action': (loc('run.py'),
         ('Main.list_action',
          95)],
                                    'first-line': 98L,
-                                   'sel-line': 118L})}
+                                   'sel-line': 120L})}
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                             'windows': [{'name': 'F8FpRDICw7YHXG3HV2rBc63asU'\
         'LBT7JH',
@@ -174,9 +174,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'view': {'area': 'tall',
                  'constraint': None,
                  'current_pages': [0,
-                                   0],
+                                   1],
                  'full-screen': False,
-                 'notebook_display': 'normal',
+                 'notebook_display': 'tabs only',
                  'notebook_percent': 0.17992831541218635,
                  'override_title': None,
                  'pagelist': [('project',
@@ -184,8 +184,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                0,
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': 0,
-        'tree-states': {'deep': {'expanded-nodes': [],
-                                 'selected-nodes': [(15,)],
+        'tree-states': {'deep': {'expanded-nodes': [(1,)],
+                                 'selected-nodes': [(1,
+        4)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
@@ -704,14 +705,14 @@ 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> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
         loc('unknown:<untitled> #5'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
@@ -745,7 +746,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'current_pages': [2,
                           0],
         'notebook_display': 'normal',
-        'notebook_percent': 0.42672064777327934,
+        'notebook_percent': 0.5894736842105264,
         'override_title': None,
         'pagelist': [('debug-breakpoints',
                       'wide',
@@ -778,7 +779,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': '',
                                        'fReverse': False,
-                                       'fSearchText': u'ConfigSou',
+                                       'fSearchText': u'blitt',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -852,17 +853,48 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 17L,
+                       'first-line': 80L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/run.py': ['m'\
-        'od\n',
-        'dir(mod)\n',
-        'mod.__name__\n']},
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/resolvers/cloudsany.py': ['u'\
+        'rl\n',
+        'print url\n',
+        'util.stream_type(s["url"])\n',
+        's\n',
+        'import run\n'],
+                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/run.py': ['u'\
+        'rl\n',
+        'print url\n',
+        'suburl\n',
+        're.sub("\\w:", "", subfile)\n',
+        'print subfile\n',
+        'if isinstance(title, str): title.decode("utf8")\n',
+        'sys.getfilesystemencoding()\n',
+        'stream["subs"][0]\n',
+        'title\n',
+        'print fname0\n'],
+                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/cinemalive.py': ['s'\
+        'tream["subs"]\n',
+        'len(stream["subs"])\n',
+        'stream["subs"][0]\n',
+        'print p0\n',
+        'url_sub\n',
+        'print url_sub\n',
+        'print url\n',
+        'url\n',
+        'urllib2.urlopen(suburl)\n',
+        're.sub("\\w:", subfile, "")\n',
+        're.sub("\\w:", subfile, ")\n',
+        're.sub(pattern, repl, string, count=0, flags=0)\n',
+        're.sub("\\w:", "", subfile)\n',
+        'unicode(title)\n',
+        'title\n',
+        'title.decode("utf8")\n',
+        'if isinstance(title, str): title.decode("utf8")\n']},
                        'launch-id': None,
-                       'sel-line': 24L,
-                       'sel-line-start': 315L,
-                       'selection_end': 327L,
-                       'selection_start': 315L,
+                       'sel-line': 94L,
+                       'sel-line-start': 3987L,
+                       'selection_end': 3987L,
+                       'selection_start': 3987L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -898,253 +930,258 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 0L,
+                       'first-line': 1L,
                        'folded-linenos': [],
-                       'history': {},
+                       'history': {None: ['print r"\\"\n',
+        'print r"\\\\"\n',
+        'print "\\\\"\n']},
                        'launch-id': None,
-                       'sel-line': 2L,
-                       'sel-line-start': 174L,
-                       'selection_end': 174L,
-                       'selection_start': 174L,
+                       'sel-line': 10L,
+                       'sel-line-start': 344L,
+                       'selection_end': 354L,
+                       'selection_start': 354L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
-        {'attrib-starts': [],
-         'first-line': 537L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
+        {'attrib-starts': [('Source',
+                            28),
+                           ('Source.get_info2',
+                            759)],
+         'first-line': 758L,
          'folded-linenos': [],
-         'sel-line': 548L,
-         'sel-line-start': 21051L,
-         'selection_end': 21072L,
-         'selection_start': 21072L,
+         'sel-line': 767L,
+         'sel-line-start': 37736L,
+         'selection_end': 37736L,
+         'selection_start': 37736L,
          'zoom': 0L},
-        1507139396.418],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 29L,
+        1507371104.021],
+        [loc('util.py'),
+         {'attrib-starts': [('unescape',
+                             538)],
+          'first-line': 539L,
           'folded-linenos': [],
-          'sel-line': 38L,
-          'sel-line-start': 1556L,
-          'selection_end': 1556L,
-          'selection_start': 1556L,
+          'sel-line': 547L,
+          'sel-line-start': 16779L,
+          'selection_end': 16779L,
+          'selection_start': 16779L,
           'zoom': 0L},
-         1507139404.352],
-        [loc('sources/config.py'),
-         {'attrib-starts': [('Source',
-                             12),
-                            ('Source.__init__',
-                             14)],
-          'first-line': 10L,
-          'folded-linenos': [],
-          'sel-line': 20L,
-          'sel-line-start': 756L,
-          'selection_end': 756L,
-          'selection_start': 756L,
-          'zoom': 0L},
-         1507139454.935],
+         1507371180.38],
         [loc('run.py'),
-         {'attrib-starts': [],
-          'first-line': 537L,
+         {'attrib-starts': [('play_stream',
+                             475)],
+          'first-line': 487L,
           'folded-linenos': [],
-          'sel-line': 548L,
-          'sel-line-start': 21051L,
-          'selection_end': 21072L,
-          'selection_start': 21072L,
+          'sel-line': 495L,
+          'sel-line-start': 18631L,
+          'selection_end': 18676L,
+          'selection_start': 18676L,
           'zoom': 0L},
-         1507139464.311],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 171L,
+         1507371335.802],
+        [loc('sources/ltc.py'),
+         {'attrib-starts': [('Source',
+                             28),
+                            ('Source.get_info2',
+                             759)],
+          'first-line': 758L,
           'folded-linenos': [],
-          'sel-line': 35L,
-          'sel-line-start': 1435L,
-          'selection_end': 1462L,
-          'selection_start': 1462L,
+          'sel-line': 768L,
+          'sel-line-start': 37779L,
+          'selection_end': 37779L,
+          'selection_start': 37779L,
           'zoom': 0L},
-         1507139509.009],
+         1507371354.506],
         [loc('run.py'),
-         {'attrib-starts': [],
-          'first-line': 537L,
+         {'attrib-starts': [('player',
+                             514)],
+          'first-line': 522L,
           'folded-linenos': [],
-          'sel-line': 544L,
-          'sel-line-start': 20857L,
-          'selection_end': 21094L,
-          'selection_start': 20857L,
+          'sel-line': 533L,
+          'sel-line-start': 20303L,
+          'selection_end': 20303L,
+          'selection_start': 20303L,
           'zoom': 0L},
-         1507139519.867],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [],
-          'first-line': 171L,
+         1507371523.35],
+        [loc('sources/ltc.py'),
+         {'attrib-starts': [('Source',
+                             28),
+                            ('Source.get_info2',
+                             759)],
+          'first-line': 758L,
           'folded-linenos': [],
-          'sel-line': 183L,
-          'sel-line-start': 7031L,
-          'selection_end': 7069L,
-          'selection_start': 7069L,
+          'sel-line': 765L,
+          'sel-line-start': 37587L,
+          'selection_end': 37587L,
+          'selection_start': 37587L,
           'zoom': 0L},
-         1507139553.439],
+         1507371547.303],
         [loc('run.py'),
-         {'attrib-starts': [],
-          'first-line': 537L,
+         {'attrib-starts': [('player',
+                             514)],
+          'first-line': 522L,
           'folded-linenos': [],
-          'sel-line': 544L,
-          'sel-line-start': 20857L,
-          'selection_end': 20989L,
-          'selection_start': 20857L,
+          'sel-line': 533L,
+          'sel-line-start': 20303L,
+          'selection_end': 20303L,
+          'selection_start': 20303L,
           'zoom': 0L},
-         1507139565.195],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 33L,
+         1507371599.675],
+        [loc('sources/ltc.py'),
+         {'attrib-starts': [('Source',
+                             28),
+                            ('Source.get_info2',
+                             759)],
+          'first-line': 758L,
           'folded-linenos': [],
-          'sel-line': 38L,
-          'sel-line-start': 1556L,
-          'selection_end': 1556L,
-          'selection_start': 1556L,
+          'sel-line': 761L,
+          'sel-line-start': 37352L,
+          'selection_end': 37357L,
+          'selection_start': 37357L,
           'zoom': 0L},
-         1507140419.978],
+         1507371766.638],
         [loc('run.py'),
-         {'attrib-starts': [],
-          'first-line': 537L,
+         {'attrib-starts': [('play_stream',
+                             475)],
+          'first-line': 482L,
           'folded-linenos': [],
-          'sel-line': 544L,
-          'sel-line-start': 20857L,
-          'selection_end': 20989L,
-          'selection_start': 20857L,
+          'sel-line': 488L,
+          'sel-line-start': 18421L,
+          'selection_end': 18426L,
+          'selection_start': 18426L,
           'zoom': 0L},
-         1507140426.687],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 33L,
+         1507371799.165],
+        [loc('sources/cinemalive.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_streams',
+                             167)],
+          'first-line': 176L,
           'folded-linenos': [],
-          'sel-line': 38L,
-          'sel-line-start': 1556L,
-          'selection_end': 1556L,
-          'selection_start': 1556L,
+          'sel-line': 172L,
+          'sel-line-start': 8312L,
+          'selection_end': 8333L,
+          'selection_start': 8333L,
           'zoom': 0L},
-         1507140443.699],
+         1507371832.849],
         [loc('run.py'),
-         {'attrib-starts': [],
-          'first-line': 537L,
+         {'attrib-starts': [('player',
+                             514)],
+          'first-line': 528L,
           'folded-linenos': [],
-          'sel-line': 544L,
-          'sel-line-start': 20857L,
-          'selection_end': 20989L,
-          'selection_start': 20857L,
+          'sel-line': 533L,
+          'sel-line-start': 20252L,
+          'selection_end': 20252L,
+          'selection_start': 20252L,
           'zoom': 0L},
-         1507140457.254],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 33L,
+         1507376935.998],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [],
+          'first-line': 250L,
           'folded-linenos': [],
-          'sel-line': 43L,
-          'sel-line-start': 1789L,
-          'selection_end': 1813L,
-          'selection_start': 1813L,
+          'sel-line': 262L,
+          'sel-line-start': 9968L,
+          'selection_end': 9968L,
+          'selection_start': 9968L,
           'zoom': 0L},
-         1507141006.36],
-        [loc('run.py'),
+         1507376953.193],
+        [loc('kivy_test.py'),
          {'attrib-starts': [],
-          'first-line': 537L,
+          'first-line': 8L,
           'folded-linenos': [],
-          'sel-line': 544L,
-          'sel-line-start': 20857L,
-          'selection_end': 20989L,
-          'selection_start': 20857L,
+          'sel-line': 17L,
+          'sel-line-start': 525L,
+          'selection_end': 535L,
+          'selection_start': 532L,
           'zoom': 0L},
-         1507141011.515],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 33L,
+         1507376964.014],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [('PlayerApp',
+                             69),
+                            ('PlayerApp.on_start',
+                             86)],
+          'first-line': 76L,
           'folded-linenos': [],
-          'sel-line': 38L,
-          'sel-line-start': 1556L,
-          'selection_end': 1556L,
-          'selection_start': 1556L,
+          'sel-line': 88L,
+          'sel-line-start': 2411L,
+          'selection_end': 2434L,
+          'selection_start': 2430L,
           'zoom': 0L},
-         1507146273.096],
-        [loc('test_sources2.py'),
-         {'attrib-starts': [('Main',
-                             12),
-                            ('Main.initUI',
-                             30)],
-          'first-line': 39L,
+         1507376965.305],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [('PlayerApp',
+                             69),
+                            ('PlayerApp.on_start',
+                             86)],
+          'first-line': 76L,
           'folded-linenos': [],
-          'sel-line': 41L,
-          'sel-line-start': 1171L,
-          'selection_end': 1857L,
-          'selection_start': 1171L,
+          'sel-line': 88L,
+          'sel-line-start': 2411L,
+          'selection_end': 2436L,
+          'selection_start': 2430L,
           'zoom': 0L},
-         1507146273.708],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 33L,
+         1507376966.453],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [('PlayerApp',
+                             69),
+                            ('PlayerApp.on_start',
+                             86)],
+          'first-line': 76L,
           'folded-linenos': [],
-          'sel-line': 38L,
-          'sel-line-start': 1556L,
-          'selection_end': 1556L,
-          'selection_start': 1556L,
+          'sel-line': 88L,
+          'sel-line-start': 2411L,
+          'selection_end': 2437L,
+          'selection_start': 2430L,
           'zoom': 0L},
-         1507146275.209],
-        [loc('sources/euronews.py'),
-         {'attrib-starts': [('Source',
-                             26),
-                            ('Source.__init__',
-                             28)],
-          'first-line': 19L,
+         1507377044.666],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [('PlayerApp',
+                             69),
+                            ('PlayerApp.on_start',
+                             86)],
+          'first-line': 85L,
           'folded-linenos': [],
-          'sel-line': 31L,
-          'sel-line-start': 919L,
-          'selection_end': 951L,
-          'selection_start': 951L,
+          'sel-line': 88L,
+          'sel-line-start': 2411L,
+          'selection_end': 2437L,
+          'selection_start': 2430L,
           'zoom': 0L},
-         1507146275.803],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 33L,
+         1507377045.853],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [('PlayerApp',
+                             69),
+                            ('PlayerApp._next_frame',
+                             187)],
+          'first-line': 197L,
+          'folded-linenos': [],
+          'sel-line': 199L,
+          'sel-line-start': 7221L,
+          'selection_end': 7251L,
+          'selection_start': 7251L,
+          'zoom': 0L},
+         1507377535.041],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [('PlayerApp',
+                             69),
+                            ('PlayerApp.redraw',
+                             214)],
+          'first-line': 230L,
           'folded-linenos': [],
-          'sel-line': 38L,
-          'sel-line-start': 1556L,
-          'selection_end': 1556L,
-          'selection_start': 1556L,
+          'sel-line': 234L,
+          'sel-line-start': 8872L,
+          'selection_end': 8945L,
+          'selection_start': 8945L,
           'zoom': 0L},
-         1507146277.883],
-        [loc('sources/SourceBase.py'),
-         {'attrib-starts': [('SourceBase',
-                             33),
-                            ('SourceBase.get_streams',
-                             62)],
-          'first-line': 54L,
+         1507377986.528],
+        [loc('kivy_test2.py'),
+         {'attrib-starts': [],
+          'first-line': 9L,
           'folded-linenos': [],
-          'sel-line': 62L,
-          'sel-line-start': 1841L,
-          'selection_end': 1860L,
-          'selection_start': 1849L,
+          'sel-line': 14L,
+          'sel-line-start': 262L,
+          'selection_end': 279L,
+          'selection_start': 279L,
           'zoom': 0L},
-         1507146278.448]],
+         1507377998.15]],
         20),
-        'current-loc': loc('ContentSources.py'),
+        'current-loc': loc('kivy_test2.py'),
         'editor-state-list': [(loc('ContentSources.py'),
                                {'attrib-starts': [('ContentSources',
         16),
@@ -1159,15 +1196,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'zoom': 0L}),
                               (loc('sources/ltc.py'),
                                {'attrib-starts': [('Source',
-        27),
+        28),
         ('Source.get_info2',
-         758)],
-                                'first-line': 753L,
+         759)],
+                                'first-line': 758L,
                                 'folded-linenos': [],
-                                'sel-line': 758L,
-                                'sel-line-start': 37252L,
-                                'selection_end': 37268L,
-                                'selection_start': 37260L,
+                                'sel-line': 761L,
+                                'sel-line-start': 37352L,
+                                'selection_end': 37357L,
+                                'selection_start': 37357L,
                                 'zoom': 0L}),
                               (loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'),
                                {'attrib-starts': [('Dialog',
@@ -1182,14 +1219,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 1011L,
                                 'zoom': 0L}),
                               (loc('util.py'),
-                               {'attrib-starts': [('info',
-        553)],
-                                'first-line': 547L,
+                               {'attrib-starts': [('unescape',
+        538)],
+                                'first-line': 539L,
                                 'folded-linenos': [],
-                                'sel-line': 555L,
-                                'sel-line-start': 16900L,
-                                'selection_end': 16920L,
-                                'selection_start': 16917L,
+                                'sel-line': 547L,
+                                'sel-line-start': 16779L,
+                                'selection_end': 16779L,
+                                'selection_start': 16779L,
                                 'zoom': 0L}),
                               (loc('sources/filmix.py'),
                                {'attrib-starts': [('Source',
@@ -1204,25 +1241,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 2353L,
                                 'zoom': 0L}),
                               (loc('run.py'),
-                               {'attrib-starts': [],
-                                'first-line': 537L,
+                               {'attrib-starts': [('player',
+        514)],
+                                'first-line': 528L,
                                 'folded-linenos': [],
-                                'sel-line': 544L,
-                                'sel-line-start': 20857L,
-                                'selection_end': 20989L,
-                                'selection_start': 20857L,
-                                'zoom': 0L}),
-                              (loc('sources/replay.py'),
-                               {'attrib-starts': [('Source',
-        30),
-        ('Source.get_content',
-         41)],
-                                'first-line': 109L,
-                                'folded-linenos': [],
-                                'sel-line': 114L,
-                                'sel-line-start': 5306L,
-                                'selection_end': 5306L,
-                                'selection_start': 5306L,
+                                'sel-line': 533L,
+                                'sel-line-start': 20252L,
+                                'selection_end': 20252L,
+                                'selection_start': 20252L,
                                 'zoom': 0L}),
                               (loc('sources/iplayer.py'),
                                {'attrib-starts': [('Source',
@@ -1241,24 +1267,63 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         30),
         ('Source.get_streams',
          167)],
-                                'first-line': 197L,
+                                'first-line': 176L,
                                 'folded-linenos': [],
-                                'sel-line': 203L,
-                                'sel-line-start': 9883L,
-                                'selection_end': 9941L,
-                                'selection_start': 9941L,
+                                'sel-line': 172L,
+                                'sel-line-start': 8312L,
+                                'selection_end': 8333L,
+                                'selection_start': 8333L,
                                 'zoom': 0L}),
-                              (loc('sources/config.py'),
-                               {'attrib-starts': [('Source',
-        12),
-        ('Source.__init__',
-         14)],
-                                'first-line': 10L,
+                              (loc('resolvers/cloudsany.py'),
+                               {'attrib-starts': [('resolve',
+        30)],
+                                'first-line': 76L,
+                                'folded-linenos': [],
+                                'sel-line': 88L,
+                                'sel-line-start': 2597L,
+                                'selection_end': 2597L,
+                                'selection_start': 2597L,
+                                'zoom': 0L}),
+                              (loc('resolvers/hqqresolver.py'),
+                               {'attrib-starts': [('resolve',
+        127)],
+                                'first-line': 155L,
+                                'folded-linenos': [],
+                                'sel-line': 166L,
+                                'sel-line-start': 6121L,
+                                'selection_end': 6141L,
+                                'selection_start': 6137L,
+                                'zoom': 0L}),
+                              (loc('resolvers/openload3.py'),
+                               {'attrib-starts': [('resolve',
+        49)],
+                                'first-line': 47L,
+                                'folded-linenos': [],
+                                'sel-line': 59L,
+                                'sel-line-start': 1909L,
+                                'selection_end': 1932L,
+                                'selection_start': 1928L,
+                                'zoom': 0L}),
+                              (loc('kivy_test.py'),
+                               {'attrib-starts': [('PlayerApp',
+        69),
+        ('PlayerApp.redraw',
+         214)],
+                                'first-line': 230L,
                                 'folded-linenos': [],
-                                'sel-line': 20L,
-                                'sel-line-start': 756L,
-                                'selection_end': 756L,
-                                'selection_start': 756L,
+                                'sel-line': 234L,
+                                'sel-line-start': 8872L,
+                                'selection_end': 8945L,
+                                'selection_start': 8945L,
+                                'zoom': 0L}),
+                              (loc('kivy_test2.py'),
+                               {'attrib-starts': [],
+                                'first-line': 0L,
+                                'folded-linenos': [],
+                                'sel-line': 2L,
+                                'sel-line-start': 45L,
+                                'selection_end': 78L,
+                                'selection_start': 78L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
@@ -1268,22 +1333,28 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('util.py'),
          loc('sources/filmix.py'),
          loc('run.py'),
-         loc('sources/replay.py'),
          loc('sources/iplayer.py'),
          loc('sources/cinemalive.py'),
-         loc('sources/config.py')]),
+         loc('resolvers/cloudsany.py'),
+         loc('resolvers/hqqresolver.py'),
+         loc('resolvers/openload3.py'),
+         loc('kivy_test.py'),
+         loc('kivy_test2.py')]),
                                'open_files': [u'sources/filmix.py',
         u'sources/iplayer.py',
-        u'sources/ltc.py',
-        u'sources/replay.py',
-        u'util.py',
         u'../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py',
+        u'resolvers/openload3.py',
+        u'ContentSources.py',
+        u'resolvers/hqqresolver.py',
+        u'resolvers/cloudsany.py',
+        u'util.py',
+        u'sources/ltc.py',
         u'sources/cinemalive.py',
-        u'sources/config.py',
         u'run.py',
-        u'ContentSources.py']},
+        u'kivy_test.py',
+        u'kivy_test2.py']},
         'saved_notebook_display': None,
-        'split_percents': {0: 0.4352047277332208},
+        'split_percents': {0: 0.5742869306087697},
         'splits': 2,
         'tab_location': 'top',
         'user_data': {}},
@@ -1296,16 +1367,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2434,
                          1440)}]}
-guimgr.recent-documents = [loc('ContentSources.py'),
+guimgr.recent-documents = [loc('unknown:untitled-2.py'),
+                           loc('kivy_test.py'),
                            loc('run.py'),
-                           loc('sources/config.py'),
                            loc('sources/cinemalive.py'),
+                           loc('sources/ltc.py'),
+                           loc('util.py'),
+                           loc('resolvers/cloudsany.py'),
+                           loc('resolvers/hqqresolver.py'),
+                           loc('ContentSources.py'),
+                           loc('resolvers/openload3.py'),
                            loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'),
                            loc('sources/filmix.py'),
-                           loc('sources/replay.py'),
-                           loc('sources/ltc.py'),
-                           loc('sources/iplayer.py'),
-                           loc('util.py')]
+                           loc('sources/iplayer.py')]
 guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'ib-starts': [('NavigableString',
                        354),
@@ -1504,6 +1578,17 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'sel-line-start': 8879L,
         'selection_end': 8954L,
         'selection_start': 8879L,
+        'zoom': 0L},
+                       loc('sources/config.py'): {'attrib-starts': [('Source',
+        12),
+        ('Source.__init__',
+         14)],
+        'first-line': 10L,
+        'folded-linenos': [],
+        'sel-line': 20L,
+        'sel-line-start': 756L,
+        'selection_end': 756L,
+        'selection_start': 756L,
         'zoom': 0L},
                        loc('sources/euronews.py'): {'attrib-starts': [('Sour'\
         'ce',
@@ -1614,14 +1699,14 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'zoom': 0L},
                        loc('sources/replay.py'): {'attrib-starts': [('Source',
         30),
-        ('Source.__init__',
-         32)],
-        'first-line': 23L,
+        ('Source.get_content',
+         41)],
+        'first-line': 109L,
         'folded-linenos': [],
-        'sel-line': 35L,
-        'sel-line-start': 1141L,
-        'selection_end': 1157L,
-        'selection_start': 1149L,
+        'sel-line': 114L,
+        'sel-line-start': 5306L,
+        'selection_end': 5306L,
+        'selection_start': 5306L,
         'zoom': 0L},
                        loc('sources/tvdom.py'): {'attrib-starts': [('Source',
         32),
@@ -1735,26 +1820,26 @@ proj.build-cmd = {None: ('default',
                          None)}
 proj.env-vars = {None: ('default',
                         [u''])}
-search.search-history = [u'ConfigSou',
+search.search-history = [u'sys.arg',
+                         u'escape',
+                         u'play_stream',
+                         u'lamb',
+                         u'isinstance',
+                         u'player',
+                         u'util',
+                         u'suburl',
+                         u'play',
+                         u'def play(',
+                         u'play(',
+                         u'subti',
+                         u'"sub"',
+                         u'openlo',
+                         u'http',
+                         u'resolve',
+                         u'ConfigSou',
                          u'contentsour',
                          u'Source',
-                         u'img',
-                         u'decode',
-                         u'lst.append',
-                         u'icong',
-                         u'icon',
-                         u'print',
-                         u'title',
-                         u'get_info',
-                         u'nfo',
-                         u'"nfo"',
-                         u'plugins',
-                         u'desc =',
-                         u'print ',
-                         u'picon_path',
-                         u'search',
-                         u'{0',
-                         u'exception']
+                         u'img']
 testing.stored-results = (1,
                           [],
                           {})

resolvers/cloudsany.py

@@ -0,0 +1,108 @@
+# -*- coding: UTF-8 -*-
+
+import re,os,sys
+import json
+try:
+    import util
+except:
+    pp = os.path.dirname(os.path.abspath(__file__))
+    sys.path.insert(0,os.sep.join(pp.split(os.sep)[:-1]))
+    import util
+import urllib2
+import requests
+try:
+    from requests.packages.urllib3.exceptions import InsecureRequestWarning
+    requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+except:
+    pass
+#from aadecode import AADecoder
+
+__author__ = 'ivars777'
+__name__ = 'cloudsany' if __name__ <> "__main__" else __name__
+
+
+def supports(url):
+    # https://cloudsany.com/i/b4kt66gm2sw4
+    return re.search(r'cloudsany\.\w+/\w/.+', url) is not None
+
+
+#INFO_URL = API_BASE_URL + '/streaming/info'
+
+def resolve(url):
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:39.0) Gecko/20100101 Firefox/39.0',
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',
+        'Accept-Encoding': 'none',
+        'Accept-Language': 'en-US,en;q=0.8',
+        'Referer': url}  # 'Connection': 'keep-alive'
+
+    # https://cloudsany.com/i/b4kt66gm2sw4
+    m = re.search('cloudsany\.\w+/i/(\w+)', url)
+    if not m:
+        return stream
+    vid=m.group(1)
+
+    r = requests.get(url, headers=headers)
+    if r.status_code <> 200:
+        raise Exception("Error getting stream")
+    r = r.content
+    m = re.search(r"'(https\|.+?jwplayer)'", r)
+    if not m:
+        print url
+        raise Exception("Can not find stream")
+
+    p = m.group(1).split("|")
+    p0 = m.group(1)
+
+
+    # Subtitles #
+    sub = {}
+    m = re.search(r"(\w+)\|label\|(\w+)\|(\w+)\|subtitles", p0)
+    if m:
+        url_sub = "https://cloudsany.com/subtitles/%s.%s" % (m.group(3), m.group(2))
+        url_title = m.group(1)
+        print url_title
+        sub["url"] = url_sub
+        sub["lang"] = m.group(1)
+        sub["name"] = m.group(1)
+        sub["type"] = "srt"
+
+    # Stream URL
+    m = re.search(r"tracks\|(\w+)\|(\w+)\|(\w+)\|files\|(\w+)\|(\w+)\|(\w+)", p0)
+    if not m:
+        raise Exception("Can not find stream url")
+    #https://dl4.sanii.co/files/8/80mbh8zjyuh61n/video.mp4
+    # 0://1v.1u.1t/1s/2/1r/1q.1p
+    num = re.search(r"0://1\w\.1\w\.1\w/1\w/(\d+)", r).group(1)
+    url = "https://%s.%s.%s/files/%s/%s/%s.%s" % (
+        m.group(6), m.group(5), m.group(4), num, m.group(3), m.group(2), m.group(1))
+    print url
+
+    s = util.item()
+    s["url"] = url
+    s["type"] = util.stream_type(s["url"])
+    s["resolver"] = __name__
+    #s["lang"] = lang
+    s["subs"] = [sub]
+    s["name"] = url
+    return [s]
+
+
+if __name__ == "__main__":
+
+    from subprocess import call
+    url = "https://cloudsany.com/i/b4kt66gm2sw4"
+    url = "https://cloudsany.com/i/jqfm2sqwar22"  # teorija par visu/SUB
+    streams = resolve(url)
+    if not streams:
+        print "No streams found"
+        sys.exit()
+
+    for s in streams:
+        print s
+    from run import player
+    player(streams[0]["url"])
+    #print streams[0]["url"]
+    #call([r"C:\Program Files (x86)\VideoLAN\VLC\vlc.exe",streams[0]["url"]])
+    pass

resolvers/hqqresolver.py

@@ -31,8 +31,7 @@ except:
     pass
 
 __author__ = 'ivars777'
-if __name__ <> "__main__":
-    __name__ = 'hqq'
+__name__ = 'hqq' if __name__ <> "__main__" else __name__
 
 
 def supports(url):

run.py

@@ -17,6 +17,8 @@ from ContentSources import ContentSources
 from sources.SourceBase import stream_type
 import util
 
+cunicode = lambda s: s.decode("utf8") if isinstance(s, str) else s
+cstr = lambda s: s.encode("utf8") if isinstance(s, unicode) else s
 
 class Main(Frame):
 
@@ -35,7 +37,7 @@ class Main(Frame):
         else:
             self.sources = ContentSources("sources", cfg_file)
         self.picons_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "picons")
-        self.tmp_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "tmp")
+        self.tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "tmp")
         if not os.path.exists(self.tmp_path):
             os.mkdir(self.tmp_path)
         self.history = []
@@ -251,31 +253,7 @@ class Main(Frame):
                 stream = streams[a]
             else:
                 stream = streams[0]
-            stream = util.stream_change(stream)
-            title = stream["name"] if not "nfo" in stream or not stream["nfo"] else util.nfo2title(stream["nfo"])
-            desc = stream["desc"] if not "nfo" in stream or not stream["nfo"] else util.nfo2desc(stream["nfo"])
-            img = stream["img"]
-            url = stream["url"]
-            suburl = ""
-            print url
-            if "subs" in stream and stream["subs"]:
-                suburl = stream["subs"][0]["url"]
-                print "\n**Download subtitles %s - %s"%(title,suburl)
-                subs = urllib2.urlopen(suburl).read()
-                if subs:
-                    fname0 = re.sub("[/\n\r\t,:\?]","_",title)
-                    subext = ".srt"
-                    subfile = os.path.join(self.tmp_path,fname0+subext)
-                    if ".xml" in suburl:
-                        subs = util.ttaf2srt(subs)
-                    with open(subfile,"w") as f:
-                        f.write(subs)
-                else:
-                    print "\n Error downloading subtitle %s"%suburl
-            print "\n**Play stream %s\n%s" % (title, url.encode("utf8"))
-            player(url,title,suburl,stream["headers"])
-
-
+            play_stream(stream, self.tmp_path)
 
     def start(self):
         self.root.mainloop()
@@ -492,48 +470,78 @@ def play_video(streams, select=False):
             stream = streams[n]
     else:
         stream = streams[0]
+    play_stream(stream)
 
+
+def play_stream(stream, tmp_path=""):
+    if not tmp_path:
+        tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "tmp")
     stream = util.stream_change(stream)
     title = stream["name"] if not "nfo" in stream or not stream["nfo"] else util.nfo2title(stream["nfo"])
     desc = stream["desc"] if not "nfo" in stream or not stream["nfo"] else util.nfo2desc(stream["nfo"])
     img = stream["img"]
     url = stream["url"]
     suburl = ""
+    subfile = ""
     print url
-    if "subs" in stream and stream["subs"]:
+    if "subs" in stream and len(stream["subs"]) > 0 and stream["subs"][0]:
         suburl = stream["subs"][0]["url"]
+        subfile = ""
         print "\n**Download subtitles %s - %s"%(title,suburl)
-        subs = urllib2.urlopen(suburl).read()
+        try:
+            subs = urllib2.urlopen(suburl).read()
+        except:
+            subs = None
         if subs:
-            fname0 = re.sub("[/\n\r\t,:\?]","_",title)
-            subext = ".srt"
-            subfile = os.path.join("",fname0+subext)
+            fname0 = re.sub("[/\n\r\t,:\?\|'~\.]","_",title)
             if ".xml" in suburl:
-                subs = ttaf2srt(subs)
-            with open(subfile,"w") as f:
-                f.write(subs)
+                subs = util.ttaf2srt(subs)
+                subext = ".srt"
+            elif ".vtt" in suburl:
+                subext = ".vtt"
+            elif ".srt" in suburl:
+                subext = ".srt"
+            else:
+                subext = ""
+            if subext:
+                subfile = cunicode(os.path.join(tmp_path,fname0+subext))
+                with open(subfile,"w") as f:
+                    f.write(subs)
         else:
             print "\n Error downloading subtitle %s"%suburl
     print "\n**Play stream %s\n%s" % (title, url.encode("utf8"))
-    return player(url,title,suburl,stream["headers"])
+    player(url,title,subfile,stream["headers"])
 
-def player(url, title = "", suburl= "",headers={}):
+def player(url, title = "", subfile = "",headers={}, player="ffplay"):
     from subprocess import call
+    title = cunicode(title).encode(sys.getfilesystemencoding())
+    # encode(sys.getfilesystemencoding())
+    subfile = unicode(subfile).encode(sys.getfilesystemencoding())
     cmd1 = [r"c:\Program Files\VideoLAN\VLC\vlc.exe",url,
-           "--meta-title",title.decode("utf8").encode(sys.getfilesystemencoding()),
+           "--meta-title",title,
            "--http-user-agent","Enigma2"
     ]
     # gst-launch-1.0 -v souphttpsrc ssl-strict=false proxy=127.0.0.1:8888 extra-headers="Origin:adadadasd"  location="http://bitdash-a.akamaihd.net/content/sintel/sintel.mpd" ! decodebin! autovideosink
     cmd2 = [
         r"C:\gstreamer\1.0\x86_64\bin\gst-launch-1.0","-v",
-        "playbin", 'uri="%s"'%url,
-        #"souphttpsrc", "ssl-strict=false",
-        #"proxy=127.0.0.1:8888",
-        #'location="%s"'%url,
-        #'!decodebin!autovideosink'
+        #"playbin", 'uri="%s"'%url,
+        "souphttpsrc", "ssl-strict=false",
+        "proxy=127.0.0.1:8888",
+        'location="%s"'%url,
+        '!decodebin!autovideosink'
     ]
-    cmd3 = ["ffplay.exe",url]
-    cmd = cmd3 if url.startswith("https") else cmd2
+
+    vf = r"drawtext=text='%{pts\:hms}':box=1:x=w-tw-10:y=h-th-10:boxcolor=black@0.5:fontsize=20:fontcolor=white"
+    if subfile and os.path.exists(subfile):
+        subfile = subfile.replace("\\", "\\\\\\\\")
+        subfile = re.sub("\w:", "", subfile)
+        vf = 'subtitles=%s,' % subfile + vf
+    cmd3 = ["ffplay.exe",url, "-window_title", title, "-vf", vf]
+    if not player:
+        cmd = cmd3 if url.startswith("https") else cmd2
+    else:
+        cmd = cmd3 if player == "ffplay" else cmd2
+    #cmd = cmd2  # visu spēlē ar gst
     ret = call(cmd)
     #if ret:
         #a = raw_input("*** Error, continue")

sources/cinemalive.py

@@ -185,37 +185,17 @@ Accept-Language: en-US,en;q=0.8
         if not m:
             raise Exception("Can not find stream")
         url = m.group(1)
-        r = self._http_request(url)
-        m = re.search(r"'(https\|.+?jwplayer)'", r)
-        if not m:
-            raise Exception("Can not find stream")
-        p = m.group(1).split("|")
-        p0 = m.group(1)
-        m = re.search(r"(Latvian)\|label\|(srt)\|(jqfm2sqwar22)\|subtitles", p0)
-        if m:
-            url_sub = "https://cloudsany.com/subtitles/%s.%s" % (m.group(3), m.group(2))
-            url_title = m.group(1)
-            print url_title
-        m = re.search(r"tracks\|(\w+)\|(\w+)\|(\w+)\|files\|(\w+)\|(\w+)\|(\w+)", p0)
-        if m:
-            #https://dl4.sanii.co/files/8/80mbh8zjyuh61n/video.mp4
-            # 0://1v.1u.1t/1s/2/1r/1q.1p
-            num = re.search(r"0://1\w\.1\w\.1\w/1\w/(\d+)", r).group(1)
-            url = "https://%s.%s.%s/files/%s/%s/%s.%s" % (
-                m.group(6), m.group(5), m.group(4), num, m.group(3), m.group(2), m.group(1))
-            print url
-            x = 1
-
-        s = util.item()
-        s["url"] = url
-        s["name"] = util.unescape(title)
-        s["desc"] = util.unescape(desc)
-        s["img"] = img
-        s["type"] = self.stream_type(s["url"])
-        s["lang"] = lang
-        return [s]
-
-
+        if "openload" in url:
+            s = resolve(url)
+            return s
+        elif "cloudsany" in url:
+            s = resolve(url)
+            for s2 in s:
+                s2["name"] = util.unescape(title)
+                s2["desc"] = util.unescape(desc)
+                s2["img"] = img
+                s2["lang"] = lang
+            return s
 
 if __name__ == "__main__":
 

sources/ltc.py

@@ -7,7 +7,7 @@
 #
 import sys, os, os.path, re, sys
 import urllib,urllib2,urlparse
-from xml.sax.saxutils import unescape,escape
+#from xml.sax.saxutils import unescape,escape
 from urllib import quote, unquote
 import datetime
 import HTMLParser
@@ -15,6 +15,7 @@ import json
 import datetime
 from SourceBase import SourceBase, stream_type
 import util
+from util import unescape
 from collections import OrderedDict
 import ssl
 if "_create_unverified_context" in dir(ssl):
@@ -764,11 +765,11 @@ Host: manstv.lattelecom.tv
         r = self.call2(data)
         m = re.search(r'"movie_titles" data-movieid=(\d+)><div class="en">([^<]+)</div><div class="lv translated">([^<]+)</div>', r)
         if m:
-            title1 = m.group(2)
-            title2 = m.group(3)
+            title1 = unescape(m.group(2))
+            title2 = unescape(m.group(3))
         else:
             m = re.search('<meta name="dr:say:title" content="([^"]+)">', r, re.IGNORECASE)
-            title1 = title2 = m.group(1) if m else "Video"
+            title1 = title2 = unescape(m.group(1)) if m else "Video"
         nfo["title"] = title2
         nfo["originaltitle"] = title1
         if nfo["originaltitle"] and not nfo["title"]:
@@ -855,8 +856,8 @@ Host: manstv.lattelecom.tv
                 stream["url"]=url
                 stream["lang"]=s[1]
                 stream["quality"]=s[2]
-                stream["name"]=title
-                stream["desc"]=desc
+                stream["name"]= unescape(title)
+                stream["desc"]= unescape(desc)
                 stream["img"] = img
                 stream["nfo"] = {"movie":nfo}
                 stream["type"]="hls" #stream_type(url)