Filmix salabots (filmix.net ux filmix.me)

PlayStream.wpr

@@ -48,6 +48,7 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
         (u'http://walterebert.com/playground/video/hls/ts/480x270.m3u8',
          ''))}
 [user attributes]
+cache.last-mime-type = {loc('unknown:<untitled> #1'): 'text/x-diff'}
 debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
         None,
         1,
@@ -80,14 +81,22 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
         None,
         1,
         0)},
-                     loc('resolver.py'): {130: (0,
+                     loc('resolver.py'): {142L: (0,
+        None,
+        1,
+        0)},
+                     loc('resolvers/hqqresolver.py'): {116L: (0,
         None,
         1,
         0),
-        138: (0,
-              None,
-              1,
-              0)},
+        154L: (0,
+               None,
+               1,
+               0),
+        174L: (0,
+               None,
+               1,
+               0)},
                      loc('resolvers/openload2.py'): {127: (0,
         None,
         1,
@@ -116,7 +125,7 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
               None,
               1,
               0)},
-                     loc('sources/filmix.py'): {87L: (0,
+                     loc('sources/filmix.py'): {76L: (0,
         None,
         1,
         0),
@@ -335,14 +344,6 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
                      loc('test_m3u8.py'): {5: (0,
         None,
         1,
-        0)},
-                     loc('util.py'): {51: (0,
-        None,
-        1,
-        0),
-                                      85: (0,
-        None,
-        1,
         0)},
                      loc('viaplay/vialib.py'): {84: (0,
         None,
@@ -5063,7 +5064,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                  'current_pages': [0,
                                    0],
                  'full-screen': False,
-                 'notebook_display': 'tabs only',
+                 'notebook_display': 'normal',
                  'notebook_percent': 0.23133716160787532,
                  'override_title': None,
                  'pagelist': [('project',
@@ -5071,10 +5072,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                0,
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': False,
-        'tree-states': {'deep': {'expanded-nodes': [(73,),
-        (107,)],
-                                 'selected-nodes': [(68,)],
-                                 'top-node': (62,)}},
+        'tree-states': {'deep': {'expanded-nodes': [(17,),
+        (75,),
+        (109,)],
+                                 'selected-nodes': [(17,
+        4)],
+                                 'top-node': (10,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
                                'tall',
@@ -5110,10 +5113,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': []})],
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
-        'current_pages': [3,
+        'current_pages': [1,
                           0],
         'notebook_display': 'normal',
-        'notebook_percent': 0.40625,
+        'notebook_percent': 0.28616352201257866,
         'override_title': None,
         'pagelist': [('batch-search',
                       'wide',
@@ -5159,9 +5162,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fMatchCase': False,
                                        'fOmitBinary': True,
                                        'fRegexFlags': 46,
-                                       'fReplaceText': u'self.',
-                                       'fReverse': False,
-                                       'fSearchText': u'exit',
+                                       'fReplaceText': u'https://filmix\\.me',
+                                       'fReverse': True,
+                                       'fSearchText': u'http://filmix\\.net',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5174,7 +5177,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                       'fReplaceOnDisk': False,
                                       'fShowFirstMatch': False,
                                       'fShowLineno': True,
-                                      'fShowReplaceWidgets': False}}),
+                                      'fShowReplaceWidgets': True}}),
                      ('debug-data',
                       'wide',
                       0,
@@ -5216,16 +5219,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 0L,
+                       'first-line': 66L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['p'\
-        'rint data\n',
-        'print url\n']},
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['u'\
+        'rl\n',
+        'print r2\n']},
                        'launch-id': None,
-                       'sel-line': 3L,
-                       'sel-line-start': 97L,
-                       'selection_end': 207L,
-                       'selection_start': 97L}),
+                       'sel-line': 0L,
+                       'sel-line-start': 0L,
+                       'selection_end': 7233L,
+                       'selection_start': 0L}),
                      ('debug-watch',
                       'wide',
                       1,
@@ -5279,184 +5282,138 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       {})],
         'primary_view_state': {'editor_states': ('vertical',
         1.0,
-        ({'bookmarks': ([[loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 0L,
+        ({'bookmarks': ([[loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 155L,
                            'folded-linenos': [],
-                           'sel-line': 96L,
-                           'sel-line-start': 3910L,
-                           'selection_end': 3925L,
-                           'selection_start': 3925L},
-                          1483389395.672],
+                           'sel-line': 178L,
+                           'sel-line-start': 7928L,
+                           'selection_end': 7967L,
+                           'selection_start': 7967L},
+                          1484248060.445],
                          [loc('sources/filmix.py'),
                           {'attrib-starts': [('Source',
         24),
         ('Source.get_content',
          49)],
-                           'first-line': 103L,
+                           'first-line': 155L,
                            'folded-linenos': [],
-                           'sel-line': 119L,
-                           'sel-line-start': 4774L,
-                           'selection_end': 4774L,
-                           'selection_start': 4774L},
-                          1483389454.103],
-                         [loc('util.py'),
-                          {'attrib-starts': [('play_video',
-        49)],
-                           'first-line': 67L,
-                           'folded-linenos': [],
-                           'sel-line': 84L,
-                           'sel-line-start': 2507L,
-                           'selection_end': 2507L,
-                           'selection_start': 2507L},
-                          1483390961.973],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        54)],
-                           'first-line': 2L,
-                           'folded-linenos': [],
-                           'sel-line': 69L,
-                           'sel-line-start': 2647L,
-                           'selection_end': 2658L,
-                           'selection_start': 2651L},
-                          1483390966.456],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        54)],
-                           'first-line': 58L,
-                           'folded-linenos': [],
-                           'sel-line': 69L,
-                           'sel-line-start': 2647L,
-                           'selection_end': 2669L,
-                           'selection_start': 2662L},
-                          1483390968.266],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324)],
-                           'first-line': 327L,
-                           'folded-linenos': [],
-                           'sel-line': 343L,
-                           'sel-line-start': 13445L,
-                           'selection_end': 13467L,
-                           'selection_start': 13464L},
-                          1483390972.427],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324)],
-                           'first-line': 327L,
+                           'sel-line': 178L,
+                           'sel-line-start': 7928L,
+                           'selection_end': 7967L,
+                           'selection_start': 7958L},
+                          1484248073.924],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [],
+                           'first-line': 133L,
                            'folded-linenos': [],
-                           'sel-line': 343L,
-                           'sel-line-start': 13445L,
-                           'selection_end': 13553L,
-                           'selection_start': 13550L},
-                          1483390973.298],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324)],
-                           'first-line': 333L,
+                           'sel-line': 150L,
+                           'sel-line-start': 5363L,
+                           'selection_end': 5363L,
+                           'selection_start': 5363L},
+                          1484248108.225],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.is_video',
+         209)],
+                           'first-line': 221L,
                            'folded-linenos': [],
-                           'sel-line': 344L,
-                           'sel-line-start': 13593L,
-                           'selection_end': 13618L,
-                           'selection_start': 13615L},
-                          1483390973.854],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324),
-        ('MainScreen.__init__',
-         356)],
-                           'first-line': 363L,
+                           'sel-line': 227L,
+                           'sel-line-start': 10479L,
+                           'selection_end': 10507L,
+                           'selection_start': 10507L},
+                          1484248439.154],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.__init__',
+         26)],
+                           'first-line': 38L,
                            'folded-linenos': [],
-                           'sel-line': 376L,
-                           'sel-line-start': 16306L,
-                           'selection_end': 16351L,
-                           'selection_start': 16347L},
-                          1483391637.716],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324),
-        ('MainScreen.__init__',
-         356)],
-                           'first-line': 356L,
+                           'sel-line': 43L,
+                           'sel-line-start': 1424L,
+                           'selection_end': 1462L,
+                           'selection_start': 1462L},
+                          1484248453.936],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.__init__',
+         26)],
+                           'first-line': 38L,
                            'folded-linenos': [],
-                           'sel-line': 361L,
-                           'sel-line-start': 15492L,
-                           'selection_end': 15532L,
-                           'selection_start': 15528L},
-                          1483391639.28],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324),
-        ('MainScreen.__init__',
-         356)],
-                           'first-line': 356L,
+                           'sel-line': 43L,
+                           'sel-line-start': 1424L,
+                           'selection_end': 1462L,
+                           'selection_start': 1444L},
+                          1484248467.841],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [],
+                           'first-line': 133L,
                            'folded-linenos': [],
-                           'sel-line': 362L,
-                           'sel-line-start': 15536L,
-                           'selection_end': 15546L,
-                           'selection_start': 15545L},
-                          1483391639.829],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324),
-        ('MainScreen.__init__',
-         356)],
-                           'first-line': 356L,
+                           'sel-line': 150L,
+                           'sel-line-start': 5363L,
+                           'selection_end': 5363L,
+                           'selection_start': 5363L},
+                          1484248485.4],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 71L,
                            'folded-linenos': [],
-                           'sel-line': 365L,
-                           'sel-line-start': 15676L,
-                           'selection_end': 15696L,
-                           'selection_start': 15694L},
-                          1483391640.578],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324),
-        ('MainScreen.__init__',
-         356)],
-                           'first-line': 356L,
+                           'sel-line': 88L,
+                           'sel-line-start': 3145L,
+                           'selection_end': 3231L,
+                           'selection_start': 3231L},
+                          1484249233.563],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [],
+                           'first-line': 133L,
                            'folded-linenos': [],
-                           'sel-line': 365L,
-                           'sel-line-start': 15676L,
-                           'selection_end': 15697L,
-                           'selection_start': 15694L},
-                          1483391641.094],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324)],
-                           'first-line': 335L,
+                           'sel-line': 150L,
+                           'sel-line-start': 5363L,
+                           'selection_end': 5363L,
+                           'selection_start': 5363L},
+                          1484249244.547],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 73L,
                            'folded-linenos': [],
-                           'sel-line': 352L,
-                           'sel-line-start': 15077L,
-                           'selection_end': 15122L,
-                           'selection_start': 15122L},
-                          1483397133.215],
+                           'sel-line': 88L,
+                           'sel-line-start': 3145L,
+                           'selection_end': 3236L,
+                           'selection_start': 3236L},
+                          1484249457.454],
                          [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 0L,
+                          {'attrib-starts': [],
+                           'first-line': 133L,
                            'folded-linenos': [],
-                           'sel-line': 96L,
-                           'sel-line-start': 3910L,
-                           'selection_end': 3925L,
-                           'selection_start': 3925L},
-                          1483397166.213],
+                           'sel-line': 150L,
+                           'sel-line-start': 5363L,
+                           'selection_end': 5363L,
+                           'selection_start': 5363L},
+                          1484249463.722],
                          [loc('sources/filmix.py'),
                           {'attrib-starts': [('Source',
         24),
         ('Source.get_content',
          49)],
-                           'first-line': 88L,
+                           'first-line': 68L,
                            'folded-linenos': [],
-                           'sel-line': 113L,
-                           'sel-line-start': 4479L,
-                           'selection_end': 4479L,
-                           'selection_start': 4479L},
-                          1483468572.85],
+                           'sel-line': 90L,
+                           'sel-line-start': 3283L,
+                           'selection_end': 3300L,
+                           'selection_start': 3300L},
+                          1484249545.935],
                          [loc('ContentSources.py'),
                           {'attrib-starts': [],
                            'first-line': 133L,
@@ -5465,16 +5422,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 5363L,
                            'selection_end': 5363L,
                            'selection_start': 5363L},
-                          1483469182.966],
-                         [loc('sources/ltc.py'),
-                          {'attrib-starts': [],
-                           'first-line': 11L,
+                          1484249603.049],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 61L,
                            'folded-linenos': [],
-                           'sel-line': 16L,
-                           'sel-line-start': 552L,
-                           'selection_end': 552L,
-                           'selection_start': 552L},
-                          1483469582.584],
+                           'sel-line': 90L,
+                           'sel-line-start': 3283L,
+                           'selection_end': 3299L,
+                           'selection_start': 3299L},
+                          1484249678.569],
                          [loc('ContentSources.py'),
                           {'attrib-starts': [],
                            'first-line': 133L,
@@ -5483,19 +5443,67 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 5363L,
                            'selection_end': 5363L,
                            'selection_start': 5363L},
-                          1483470729.597],
-                         [loc('sources/ltc.py'),
+                          1484249694.129],
+                         [loc('sources/filmix.py'),
                           {'attrib-starts': [('Source',
         24),
         ('Source.get_content',
-         71)],
-                           'first-line': 67L,
+         49)],
+                           'first-line': 155L,
                            'folded-linenos': [],
-                           'sel-line': 72L,
-                           'sel-line-start': 2705L,
-                           'selection_end': 2705L,
-                           'selection_start': 2705L},
-                          1483470974.796]],
+                           'sel-line': 168L,
+                           'sel-line-start': 7272L,
+                           'selection_end': 7331L,
+                           'selection_start': 7313L},
+                          1484249804.062],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 173L,
+                           'folded-linenos': [],
+                           'sel-line': 195L,
+                           'sel-line-start': 9005L,
+                           'selection_end': 9061L,
+                           'selection_start': 9043L},
+                          1484249827.338],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 163L,
+                           'folded-linenos': [],
+                           'sel-line': 168L,
+                           'sel-line-start': 7272L,
+                           'selection_end': 7331L,
+                           'selection_start': 7313L},
+                          1484249831.281],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 173L,
+                           'folded-linenos': [],
+                           'sel-line': 195L,
+                           'sel-line-start': 9005L,
+                           'selection_end': 9061L,
+                           'selection_start': 9061L},
+                          1484249835.116],
+                         [loc('sources/filmix.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 173L,
+                           'folded-linenos': [],
+                           'sel-line': 195L,
+                           'sel-line-start': 9005L,
+                           'selection_end': 9061L,
+                           'selection_start': 9043L},
+                          1484249845.15]],
                         20),
           'current-loc': loc('ContentSources.py'),
           'editor-state-list': [(loc('plugin.py'),
@@ -5508,23 +5516,25 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_end': 208,
                                   'selection_start': 199}),
                                 (loc('PlayStream.py'),
-                                 {'attrib-starts': [('MainScreen',
-        324)],
-                                  'first-line': 335L,
+                                 {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.get_subs_current',
+         171)],
+                                  'first-line': 169L,
                                   'folded-linenos': [],
-                                  'sel-line': 352L,
-                                  'sel-line-start': 15077L,
-                                  'selection_end': 15122L,
-                                  'selection_start': 15122L}),
+                                  'sel-line': 183L,
+                                  'sel-line-start': 7324L,
+                                  'selection_end': 7366L,
+                                  'selection_start': 7358L}),
                                 (loc('util.py'),
-                                 {'attrib-starts': [('play_video',
-        49)],
-                                  'first-line': 67L,
+                                 {'attrib-starts': [('request',
+        285)],
+                                  'first-line': 271L,
                                   'folded-linenos': [],
-                                  'sel-line': 84L,
-                                  'sel-line-start': 2507L,
-                                  'selection_end': 2507L,
-                                  'selection_start': 2507L}),
+                                  'sel-line': 295L,
+                                  'sel-line-start': 9782L,
+                                  'selection_end': 9809L,
+                                  'selection_start': 9809L}),
                                 (loc('ContentSources.py'),
                                  {'attrib-starts': [],
                                   'first-line': 133L,
@@ -5536,25 +5546,25 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 (loc('sources/kinofilmnet.py'),
                                  {'attrib-starts': [('Source',
         23),
-        ('Source.get_streams',
-         149)],
-                                  'first-line': 154,
+        ('Source.__init__',
+         25)],
+                                  'first-line': 21L,
                                   'folded-linenos': [],
-                                  'sel-line': 166,
-                                  'sel-line-start': 7521,
-                                  'selection_end': 7521,
-                                  'selection_start': 7521}),
+                                  'sel-line': 31L,
+                                  'sel-line-start': 971L,
+                                  'selection_end': 1211L,
+                                  'selection_start': 971L}),
                                 (loc('sources/ltc.py'),
                                  {'attrib-starts': [('Source',
         24),
         ('Source.get_content',
          71)],
-                                  'first-line': 67L,
+                                  'first-line': 298L,
                                   'folded-linenos': [],
-                                  'sel-line': 72L,
-                                  'sel-line-start': 2705L,
-                                  'selection_end': 2705L,
-                                  'selection_start': 2705L}),
+                                  'sel-line': 307L,
+                                  'sel-line-start': 17118L,
+                                  'selection_end': 17261L,
+                                  'selection_start': 17242L}),
                                 (loc('resolvers/hdgo.py'),
                                  {'attrib-starts': [('supports',
         37)],
@@ -5569,34 +5579,71 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         24),
         ('Source.get_content',
          49)],
-                                  'first-line': 88L,
+                                  'first-line': 173L,
                                   'folded-linenos': [],
-                                  'sel-line': 113L,
-                                  'sel-line-start': 4479L,
-                                  'selection_end': 4479L,
-                                  'selection_start': 4479L}),
+                                  'sel-line': 195L,
+                                  'sel-line-start': 9005L,
+                                  'selection_end': 9061L,
+                                  'selection_start': 9043L}),
                                 (loc('sources/replay.py'),
                                  {'attrib-starts': [('Source',
         25),
         ('Source.get_content',
          36)],
-                                  'first-line': 233,
+                                  'first-line': 233L,
                                   'folded-linenos': [],
-                                  'sel-line': 245,
-                                  'sel-line-start': 13416,
-                                  'selection_end': 13416,
-                                  'selection_start': 13416}),
+                                  'sel-line': 245L,
+                                  'sel-line-start': 13416L,
+                                  'selection_end': 13416L,
+                                  'selection_start': 13416L}),
                                 (loc('sources/ustvnow.py'),
                                  {'attrib-starts': [('Source',
         28),
         ('Source.login',
          44)],
-                                  'first-line': 48,
+                                  'first-line': 48L,
+                                  'folded-linenos': [],
+                                  'sel-line': 59L,
+                                  'sel-line-start': 2351L,
+                                  'selection_end': 2351L,
+                                  'selection_start': 2351L}),
+                                (loc('resolver.py'),
+                                 {'attrib-starts': [],
+                                  'first-line': 108L,
+                                  'folded-linenos': [],
+                                  'sel-line': 141L,
+                                  'sel-line-start': 5472L,
+                                  'selection_end': 5472L,
+                                  'selection_start': 5472L}),
+                                (loc('resolvers/hqqresolver.py'),
+                                 {'attrib-starts': [('resolve',
+        113)],
+                                  'first-line': 147L,
+                                  'folded-linenos': [],
+                                  'sel-line': 169L,
+                                  'sel-line-start': 6737L,
+                                  'selection_end': 6796L,
+                                  'selection_start': 6792L}),
+                                (loc('resolvers/kodik.py'),
+                                 {'attrib-starts': [('supports',
+        49)],
+                                  'first-line': 55L,
                                   'folded-linenos': [],
-                                  'sel-line': 59,
-                                  'sel-line-start': 2351,
-                                  'selection_end': 2351,
-                                  'selection_start': 2351})],
+                                  'sel-line': 49L,
+                                  'sel-line-start': 1519L,
+                                  'selection_end': 1519L,
+                                  'selection_start': 1519L}),
+                                (loc('sources/iplayer.py'),
+                                 {'attrib-starts': [('Source',
+        23),
+        ('Source.get_streams',
+         228)],
+                                  'first-line': 247L,
+                                  'folded-linenos': [],
+                                  'sel-line': 261L,
+                                  'sel-line-start': 13399L,
+                                  'selection_end': 13428L,
+                                  'selection_start': 13424L})],
           'has-focus': True,
           'locked': False},
          [loc('plugin.py'),
@@ -5608,7 +5655,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('resolvers/hdgo.py'),
           loc('sources/filmix.py'),
           loc('sources/replay.py'),
-          loc('sources/ustvnow.py')]),
+          loc('sources/ustvnow.py'),
+          loc('resolver.py'),
+          loc('resolvers/hqqresolver.py'),
+          loc('resolvers/kodik.py'),
+          loc('sources/iplayer.py')]),
         ({'bookmarks': ([[loc('sources/viaplay.py'),
                           {'attrib-starts': [('Source',
         19),
@@ -5865,6 +5916,26 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line-start': 2695,
                                   'selection_end': 2768,
                                   'selection_start': 2768}),
+                                (loc('resolvers/hqqresolver.py'),
+                                 {'attrib-starts': [('resolve',
+        113)],
+                                  'first-line': 144,
+                                  'folded-linenos': [],
+                                  'sel-line': 155,
+                                  'sel-line-start': 5872,
+                                  'selection_end': 5872,
+                                  'selection_start': 5872}),
+                                (loc('sources/iplayer.py'),
+                                 {'attrib-starts': [('Source',
+        23),
+        ('Source.get_streams',
+         228)],
+                                  'first-line': 245L,
+                                  'folded-linenos': [],
+                                  'sel-line': 260L,
+                                  'sel-line-start': 13310L,
+                                  'selection_end': 13396L,
+                                  'selection_start': 13396L}),
                                 (loc('sources/kinofilmnet.py'),
                                  {'attrib-starts': [('Source',
         23),
@@ -5887,6 +5958,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line-start': 31798,
                                   'selection_end': 31915,
                                   'selection_start': 31798}),
+                                (loc('resolvers/kodik.py'),
+                                 {'attrib-starts': [],
+                                  'first-line': 57,
+                                  'folded-linenos': [],
+                                  'sel-line': 0,
+                                  'sel-line-start': 0,
+                                  'selection_end': 0,
+                                  'selection_start': 0}),
                                 (loc('PlayStream.py'),
                                  {'attrib-starts': [],
                                   'first-line': 0L,
@@ -5903,6 +5982,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line-start': 108,
                                   'selection_end': 118,
                                   'selection_start': 112}),
+                                (loc('resolver.py'),
+                                 {'attrib-starts': [('resolve',
+        58)],
+                                  'first-line': 62,
+                                  'folded-linenos': [],
+                                  'sel-line': 68,
+                                  'sel-line-start': 2523,
+                                  'selection_end': 2535,
+                                  'selection_start': 2527}),
                                 (loc('sources/ustvnow.py'),
                                  {'attrib-starts': [('Source',
         28),
@@ -5939,22 +6027,30 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          [loc('ContentSources.py'),
           loc('sources/filmix.py'),
           loc('resolvers/hdgo.py'),
+          loc('resolvers/hqqresolver.py'),
+          loc('sources/iplayer.py'),
           loc('sources/kinofilmnet.py'),
           loc('sources/ltc.py'),
+          loc('resolvers/kodik.py'),
           loc('PlayStream.py'),
           loc('plugin.py'),
+          loc('resolver.py'),
           loc('sources/ustvnow.py'),
           loc('util.py'),
           loc('sources/replay.py')])),
                                'open_files': [u'PlayStream.py',
         u'plugin.py',
+        u'resolver.py',
         u'resolvers/hdgo.py',
+        u'resolvers/hqqresolver.py',
+        u'sources/iplayer.py',
         u'sources/kinofilmnet.py',
+        u'sources/ltc.py',
         u'sources/replay.py',
         u'sources/ustvnow.py',
         u'util.py',
+        u'resolvers/kodik.py',
         u'sources/filmix.py',
-        u'sources/ltc.py',
         u'ContentSources.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.33756345177664976},
@@ -5971,13 +6067,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          2405,
                          1376)}]}
 guimgr.recent-documents = [loc('ContentSources.py'),
-                           loc('sources/ltc.py'),
+                           loc('sources/filmix.py'),
                            loc('PlayStream.py'),
                            loc('util.py'),
-                           loc('sources/filmix.py'),
-                           loc('sources/ustvnow.py'),
+                           loc('resolvers/kodik.py'),
+                           loc('resolver.py'),
+                           loc('resolvers/hqqresolver.py'),
+                           loc('sources/iplayer.py'),
                            loc('sources/kinofilmnet.py'),
+                           loc('sources/ustvnow.py'),
                            loc('sources/replay.py'),
+                           loc('sources/ltc.py'),
                            loc('resolvers/hdgo.py'),
                            loc('plugin.py')]
 guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
@@ -6687,6 +6787,15 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 0L,
         'selection_end': 0L,
         'selection_start': 0L},
+                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
+        's': [('findall',
+               172)],
+        'first-line': 162,
+        'folded-linenos': [],
+        'sel-line': 180,
+        'sel-line-start': 8708,
+        'selection_end': 8708,
+        'selection_start': 8708},
                        loc('../../../../Python27/lib/BaseHTTPServer.py'): {'a'\
         'ttrib-starts': [('BaseHTTPRequestHandler',
                           113),
@@ -6707,15 +6816,6 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 2478,
         'selection_end': 2478,
         'selection_start': 2478},
-                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
-        's': [('findall',
-               172)],
-        'first-line': 162,
-        'folded-linenos': [],
-        'sel-line': 180,
-        'sel-line-start': 8708,
-        'selection_end': 8708,
-        'selection_start': 8708},
                        loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 24,
@@ -6778,9 +6878,20 @@ proj.pyexec = {None: ('custom',
 proj.pypath = {None: ('custom',
                       [u'c:\\Data\\Programming\\enigma2\\python',
                        u''])}
-search.replace-history = [u'self',
+search.replace-history = [u'https://filmix\\.me',
+                          u'https://filmix.me/',
+                          u'filmix.me',
+                          u'self',
                           u'current']
-search.search-history = [u'red',
+search.search-history = [u'http://filmix\\.net',
+                         u'http://filmix.me/',
+                         u'filmix.net',
+                         u'sort',
+                         u'urllib2',
+                         u'subs',
+                         u'cur_subs',
+                         u'pssub',
+                         u'red',
                          u'eServiceReference',
                          u'service',
                          u'gst',
@@ -6791,15 +6902,8 @@ search.search-history = [u'red',
                          u'title=',
                          u'ChoiceBox',
                          u'settil',
-                         u'"text"',
-                         u'choice',
-                         u'ch',
-                         u'resume_pos',
-                         u'List(',
-                         u'List',
-                         u'ChoiceList',
-                         u'choiceli',
-                         u'ChoiceEntryComponent']
+                         u'"text"']
 testing.stored-results = (1,
                           [],
                           {})
+versioncontrol.git.remote-history = ['http://git.blue.lv/root/PlayStream.git']

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.5l
+    set ver=0.5m
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF

resolver.py

@@ -90,7 +90,7 @@ def resolve(url):
                 if "=" in h:
                     i["headers"][h.split("=")[0]] = h.split("=")[1]
 
-    return sorted(value, key=lambda i: i['quality'])
+    return sorted(value, key=lambda i: i['quality'], reverse=True)
 
 
 def _get_resolver(url):
@@ -122,10 +122,14 @@ if __name__ == "__main__":
     #url = "https://openload.co/embed/bE7WfZ/" 
     #url = "https://openload.co/embed/OuskaKyC2GU/"
     url = "http://hqq.tv/player/embed_player.php?vid=235238210241210222228241233208212245&autoplay=no"
-    url = "https://openload.co/embed/rmNcP-0QopE/"
-    url = "https://openload.co/embed/gpLF6Grzy80/"
-    url = "https://openload.co/embed/oQLXcU1ITAY/"
-    url = "http://hqq.tv/player/embed_player.php?vid=245208228234224222241224221239207212&autoplay=no"
+    url = "https://hqq.tv/player/embed_player.php?vid=235242211228257255206246241253244213194271217261258"
+    #url = "https://openload.co/embed/rmNcP-0QopE/"
+    #url = "https://openload.co/embed/gpLF6Grzy80/"
+    #url = "https://openload.co/embed/oQLXcU1ITAY/"
+    #url = "http://hqq.tv/player/embed_player.php?vid=245208228234224222241224221239207212&autoplay=no"
+    url = "https://goo.gl/yMTzqf"
+    url = "http://cdn.kapnob.ru/video/5e67c8b1ad018ffa/iframe"
+    url = "http://kodik.cc/video/10830/4269a802d1a9d9bdc53fe38488d53a52/720p"
     streams = resolve(url)
     if not streams:
         print "No streams found"

resolvers/hqqresolver.py

@@ -114,11 +114,16 @@ def _decode2(file_url):
 def resolve(url):
     m = _regex(url)
     if m:
-        vid = m.group('vid')
         headers = {'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
                    'Content-Type': 'text/html; charset=utf-8'}
-        player_url = "http://hqq.tv/player/embed_player.php?vid=%s&autoplay=no" % vid
-        data = util.request(player_url, headers)
+        if "goo.gl" in url:
+            data = util.request(url, headers)
+            player_url = re.search("var ppage = '(.+?)'",data).group(1)
+            player_url = urllib.unquote(player_url)
+        else:
+            vid = m.group('vid')
+            player_url = "http://hqq.tv/player/embed_player.php?vid=%s&autoplay=no" % vid
+            data = util.request(player_url, headers)
         b64enc = re.search('base64([^\"]+)', data, re.DOTALL)
         b64dec = b64enc and base64.decodestring(b64enc.group(1))
         enc = b64dec and re.search("\'([^']+)\'", b64dec).group(1)
@@ -144,6 +149,8 @@ def resolve(url):
                 vid_link = re.search(r'var\s*%s\s*=\s*"([^"]*?)"'%link_1, data)
                 at = re.search(r'var\s*at\s*=\s*"([^"]*?)"', data)
                 vid = re.search('vid: "([^"]+)"',data)
+                subs = re.search('sub:"(.+?)"',data).group(1) if re.search('sub:"(.+?)"',data) else ""
+                subs_lang = re.search('sublangs:"(.+?)"',data).group(1) if re.search('sub:"(.+?)"',data) else ""
                 if vid_server and vid_link and at:
                     get_data = {'server_1': vid_server.group(1),
                                 'link_1': vid_link.group(1),
@@ -158,11 +165,18 @@ def resolve(url):
                     if 'file' in data:
                         file_url = _decode2(data['file'])
                         file_url = re.sub(r'\?socket=?$', '.mp4.m3u8',file_url)
-                        return [{'url': file_url, 'quality': '360p',"headers":{"User-Agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/47.0.2526.70 Mobile/13C71 Safari/601.1.46"}}]
-    return None
+                        stream  = {
+                            'url': file_url, 
+                            'subs':[{"url":subs,'name':subs_lang,"lang":subs_lang}],
+                            'quality': '?',
+                            "headers":{"User-Agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/47.0.2526.70 Mobile/13C71 Safari/601.1.46"}
+                        }
+                        return [stream]
+    return []
 
 
 def _regex(url):
+    # https://goo.gl/yMTzqf
     match = re.search("(hqq|netu)\.tv/watch_video\.php\?v=(?P<vid>[0-9A-Z]+)", url)
     if match:
         return match
@@ -174,6 +188,11 @@ def _regex(url):
         match = re.search(r'var\s+vid\s*=\s*\'(?P<vid>[^\']+)\'', urllib.unquote(util.request(url)))
         if match:
             return match
+    # https://goo.gl/yMTzqf
+    match = re.search("(goo)\.gl/(?P<vid>[\w]+)", url)
+    if match:
+        return match
+    
     b64enc = re.search(r'data:text/javascript\;charset\=utf\-8\;base64([^\"]+)', url)
     b64dec = b64enc and base64.decodestring(b64enc.group(1))
     enc = b64dec and re.search(r"\'([^']+)\'", b64dec).group(1)

sources/filmix.py

@@ -26,12 +26,12 @@ class Source(SourceBase):
     
     def __init__(self,country=""):
         self.name = "filmix"
-        self.title = "Filmix.net"
+        self.title = "filmix.me"
         self.img = "http://cs5324.vk.me/g33668783/a_903fcc63.jpg"
-        self.desc = "Filmix.net satura skatīšanās"
+        self.desc = "filmix.me satura skatīšanās"
         self.country=country
         self.headers = headers2dict("""
-Host: filmix.net
+Host: filmix.me
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:46.0) Gecko/20100101 Firefox/46.0
 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 Accept-Language: en-US,en;q=0.5
@@ -41,7 +41,7 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:46.0) Gecko/20100101 Firefox
 X-Requested-With: XMLHttpRequest
 Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 """)
-        self.url = "http://filmix.net/"
+        self.url = "https://filmix.me/"
         #self.login()
         
     def login(self,user="",password=""):
@@ -86,7 +86,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             m = re.search('<span class="menu-title">%s</span>(.+?)<li>\s+?<span'%sname, r, re.DOTALL|re.UNICODE)
             if not m: return content
             r2 = m.group(1)
-            result = re.findall(r'<a href="http://filmix\.net/([^"]+)".*?>([^<]+)</a>', r2, re.DOTALL)
+            result = re.findall(r'<a .*?href="https://filmix\.me/([^"]+)".*?>([^<]+)</', r2, re.DOTALL)
             for item in result:
                 if "catalog" in item[0]: continue
                 title = item[1]
@@ -166,7 +166,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             r = self.call(data)
             r = r.decode("cp1251").encode("utf8")
             for r2 in re.findall('<article class="shortstory line".+?</article>', r, re.DOTALL):
-                m = re.search(r'<a href="http://filmix\.net/play/(\d+)" class="watch icon-play">', r2, re.DOTALL)
+                m = re.search(r'<a href="https://filmix\.me/play/(\d+)" class="watch icon-play">', r2, re.DOTALL)
                 if not m: continue
                 vid = m.group(1)
                 data2 = "play/%s"%vid
@@ -176,7 +176,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 if m:
                     title = title + "/"+m.group(1)
                 m = re.search('<img src="([^"]+.jpg)"', r2, re.DOTALL)
-                img = "http://filmix.net"+m.group(1) if m else self.img
+                img = "http://filmix.me"+m.group(1) if m else self.img
                 m = re.search(r'<a itemprop="copyrightYear".+?>(\d+)<', r2, re.DOTALL)
                 if m:
                     year = m.group(1) if m else ""
@@ -193,7 +193,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 desc="%s\n%s\n%s\n%s\n%s"%(title,genre,desc0,actors,quality)
                 content.append((title,self.name+"::"+data2,img,desc))
             if '<div class="navigation">' in r:
-                m = re.search(r'href="http://filmix\.net/([^"]+)" class="next icon-arowRight btn-tooltip"', r, re.DOTALL)
+                m = re.search(r'href="https://filmix\.me/([^"]+)" class="next icon-arowRight btn-tooltip"', r, re.DOTALL)
                 if m:
                     data2 = m.group(1)
                 else:

sources/kinofilmnet.py

@@ -169,7 +169,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             url0 = result[0]
         streams =  resolver.resolve(url0)
         for s in streams:
-            if "hqq." in url0:
+            if "hqq." in url0 or "goo.gl" in url0:
                 s["url"] = util.streamproxy_encode(s["url"],s["headers"])
                 s["headers"]={}
             s["name"] = title