salabots filmix, tvplay

changelog.md

@@ -1,3 +1,6 @@
+**23.12.2018**
+- salabots tvplay, filmix
+
 **05.12.2018**
 - pielabots ltc (arhīvu bildes, kārtība u.c.)
 

project.wpr

@@ -92,11 +92,7 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
                None,
                1,
                0)},
-                     loc('run.py'): {198L: (0,
-        None,
-        1,
-        0),
-                                     277L: (0,
+                     loc('run.py'): {277L: (0,
         None,
         1,
         0),
@@ -131,10 +127,6 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
                      loc('sources/filmas.py'): {110L: (0,
         None,
         1,
-        0)},
-                     loc('sources/filmix.py'): {77L: (0,
-        None,
-        1,
         0)},
                      loc('sources/filmon.py'): {49L: (0,
         None,
@@ -183,6 +175,10 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
                      loc('sources/tvdom.py'): {292L: (0,
         None,
         1,
+        0)},
+                     loc('sources/tvplay.py'): {124L: (0,
+        None,
+        1,
         0)},
                      loc('test_sources.py'): {7L: (0,
         None,
@@ -204,11 +200,11 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
             None,
             1,
             0)},
-                     loc('unknown:<untitled> #1'): {2: (0,
+                     loc('unknown:<untitled> #2'): {10: (0,
         None,
         1,
         0)},
-                     loc('unknown:<untitled> #2'): {10: (0,
+                     loc('unknown:<untitled> #1'): {2: (0,
         None,
         1,
         0)}}
@@ -683,7 +679,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                    'selected-nodes': [],
                                    'top-node': [('generic attribute',
         loc('sources/filmas.py'),
-        'c')]},
+        'data')]},
         loc('sources/filmix.py'): {'expanded-nodes': [],
                                    'selected-nodes': [],
                                    'top-node': [('generic attribute',
@@ -736,7 +732,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         loc('sources/tvdom.py'),
         'data')]},
         loc('sources/tvplay.py'): {'expanded-nodes': [],
-                                   'selected-nodes': [],
+                                   'selected-nodes': [[('generic attribute',
+        loc('sources/tvplay.py'),
+        'data')]],
                                    'top-node': [('generic attribute',
         loc('sources/tvplay.py'),
         'data')]},
@@ -853,8 +851,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'): {'exp'\
         'anded-nodes': [],
         'selected-nodes': [],
-        'top-node': None},
-        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
+        'top-node': [('generic attribute',
+                      loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
+                      'ADAPTIVE')]},
+        loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'): {'e'\
+        'xpanded-nodes': [],
+        'selected-nodes': [[('function def',
+                             loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'),
+                             '_show')]],
+        'top-node': [('class def',
+                      loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'),
+                      'BitmapImage')]},
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
         loc('unknown:<untitled> #6'): {'column-widths': [1.0],
@@ -865,7 +873,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -895,7 +903,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'current_pages': [2,
                           0],
         'notebook_display': 'normal',
-        'notebook_percent': 0.32746196957566054,
+        'notebook_percent': 0.32265812650120096,
         'override_title': None,
         'pagelist': [('debug-breakpoints',
                       'wide',
@@ -928,10 +936,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 42,
                                        'fReplaceText': u'filmix.co',
                                        'fReverse': False,
-                                       'fSearchText': u' for item in r["content"]:',
+                                       'fSearchText': u'sorted',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
-                                       'fWholeWords': False,
+                                       'fWholeWords': True,
                                        'fWrap': True},
                        'fUIOptions': {'fAutoBackground': True,
                                       'fFilePrefix': 'short-file',
@@ -1002,54 +1010,47 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 266L,
+                       'first-line': 128L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/lmt.py': [" "\
-        "re.search('embed.php?salt=([^\"]+)\"', r, re.DOTALL)\n",
-        " re.search('embed.php?salt=([^\"]+)\"', r)\n",
-        " re.search('embed.php?salt=', r)\n",
-        " re.search('embed\\.php\\?salt=([^\"]+)\"', r)\n",
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/filmix.py': ['p'\
+        'rint js[1]\n',
+        'print js[1]["folder"]\n',
+        'print js[1]["folder"][1]\n',
+        'print js[1]["folder"][1]["title"]\n',
+        'items\n',
+        'js[s-1]\n',
+        'len(js[s-1])\n',
         'js\n',
-        'js["title"]\n',
-        'js["data"]["title"]\n',
-        'js["data"]["poster"]\n',
-        'js["data"]["versions"]\n',
-        'js["data"]["versions"].keys()\n',
-        'for v in  js["data"]["versions"].keys(): print vars\n',
-        'for v in  js["data"]["versions"].keys(): print v\n',
-        'js["data"]["versions"][ver]\n',
-        'js["data"]["versions"]["HD"]\n',
-        'data = js["data"]["versions"]["HD"]\n',
-        'sdata = js["data"]["versions"]["HD"]\n',
-        'sdata\n',
-        'sdata[0]\n',
-        'sdata[2]\n',
-        'sdata[1]["scr"]\n',
-        'sdata[1]\n',
-        'sdata[1].keys()\n',
-        'sdata[1]["src"]\n',
-        '    s\n',
-        's["desc"]\n']},
+        'print title\n',
+        'js[s-1]["folder"][i - 1]["title"]\n',
+        'js[s-1]["folder"][i - 1]["title"].print\n',
+        'print js[s-1]["folder"][i - 1]["title"]\n',
+        'len(js)\n',
+        'len(translations)\n',
+        'img\n',
+        'st\n',
+        'm.group(0)\n',
+        'data\n']},
                        'launch-id': None,
-                       'sel-line': 267L,
-                       'sel-line-start': 14574L,
-                       'selection_end': 14574L,
-                       'selection_start': 14574L,
+                       'sel-line': 132L,
+                       'sel-line-start': 12260L,
+                       'selection_end': 12272L,
+                       'selection_start': 12261L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
                       1,
                       {'node-states': [('eval',
-        u'r2'),
+        u'js'),
                                        ('eval',
-        u'data'),
+        u'data2'),
                                        ('eval',
-        u'theme'),
+        u'title'),
                                        ('eval',
         u'item'),
                                        ('eval',
         u'url')],
-                       'tree-state': {'expanded-nodes': [],
+                       'tree-state': {'expanded-nodes': [(0,)],
                                       'selected-nodes': [(0,)],
                                       'top-node': (0,)}}),
                      ('messages',
@@ -1082,299 +1083,316 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'selection_end': 163L,
                        'selection_start': 163L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
-        {'attrib-starts': [('Main',
-                            22),
-                           ('Main.list_action',
-                            106)],
-         'first-line': 94L,
-         'folded-linenos': [],
-         'sel-line': 110L,
-         'sel-line-start': 4515L,
-         'selection_end': 4515L,
-         'selection_start': 4515L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/tvplay.py'),
+        {'attrib-starts': [('Source',
+                            32),
+                           ('Source.get_content',
+                            62)],
+         'first-line': 84L,
+         'folded-linenos': [159L],
+         'sel-line': 99L,
+         'sel-line-start': 4495L,
+         'selection_end': 4545L,
+         'selection_start': 4534L,
          'zoom': 0L},
-        1539298436.081],
-        [loc('sources/replay.py'),
+        1545558002.612],
+        [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             220)],
-          'first-line': 165L,
-          'folded-linenos': [70L,
-                             89L,
-                             143L,
-                             166L,
-                             284L],
-          'sel-line': 221L,
-          'sel-line-start': 11331L,
-          'selection_end': 11331L,
-          'selection_start': 11331L,
+                             32),
+                            ('Source.get_content',
+                             62)],
+          'first-line': 84L,
+          'folded-linenos': [159L],
+          'sel-line': 100L,
+          'sel-line-start': 4552L,
+          'selection_end': 4593L,
+          'selection_start': 4582L,
           'zoom': 0L},
-         1539298448.838],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.list_action',
-                             106)],
+         1545558003.204],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [('Source',
+                             32),
+                            ('Source.get_content',
+                             62)],
           'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 118L,
-          'sel-line-start': 4754L,
-          'selection_end': 4754L,
-          'selection_start': 4754L,
+          'folded-linenos': [159L],
+          'sel-line': 111L,
+          'sel-line-start': 5003L,
+          'selection_end': 5046L,
+          'selection_start': 5035L,
           'zoom': 0L},
-         1539298521.416],
-        [loc('sources/replay.py'),
+         1545558778.089],
+        [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             220)],
-          'first-line': 165L,
-          'folded-linenos': [70L,
-                             89L,
-                             143L,
-                             166L,
-                             284L],
-          'sel-line': 221L,
-          'sel-line-start': 11331L,
-          'selection_end': 11331L,
-          'selection_start': 11331L,
+                             32),
+                            ('Source.get_content',
+                             62)],
+          'first-line': 100L,
+          'folded-linenos': [159L],
+          'sel-line': 112L,
+          'sel-line-start': 5049L,
+          'selection_end': 5103L,
+          'selection_start': 5100L,
           'zoom': 0L},
-         1539298544.426],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.list_action',
-                             106)],
-          'first-line': 94L,
-          'folded-linenos': [],
-          'sel-line': 110L,
-          'sel-line-start': 4515L,
-          'selection_end': 4515L,
-          'selection_start': 4515L,
+         1545558778.193],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [('Source',
+                             32),
+                            ('Source.get_content',
+                             62)],
+          'first-line': 107L,
+          'folded-linenos': [159L],
+          'sel-line': 116L,
+          'sel-line-start': 5360L,
+          'selection_end': 5401L,
+          'selection_start': 5385L,
           'zoom': 0L},
-         1539298552.821],
-        [loc('sources/replay.py'),
+         1545558783.365],
+        [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             220)],
-          'first-line': 402L,
-          'folded-linenos': [70L,
-                             89L,
-                             143L,
-                             166L,
-                             284L],
-          'sel-line': 412L,
-          'sel-line-start': 20394L,
-          'selection_end': 20394L,
-          'selection_start': 20394L,
+                             32),
+                            ('Source.__init__',
+                             34)],
+          'first-line': 45L,
+          'folded-linenos': [159L],
+          'sel-line': 50L,
+          'sel-line-start': 1642L,
+          'selection_end': 1666L,
+          'selection_start': 1650L,
           'zoom': 0L},
-         1539298751.21],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.initUI',
-                             47)],
-          'first-line': 62L,
-          'folded-linenos': [],
-          'sel-line': 67L,
-          'sel-line-start': 2534L,
-          'selection_end': 2534L,
-          'selection_start': 2534L,
+         1545558791.827],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [('Source',
+                             32),
+                            ('Source.get_content',
+                             62)],
+          'first-line': 104L,
+          'folded-linenos': [159L],
+          'sel-line': 106L,
+          'sel-line-start': 4768L,
+          'selection_end': 4862L,
+          'selection_start': 4850L,
           'zoom': 0L},
-         1539298794.934],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.show_desc',
-                             196)],
-          'first-line': 186L,
+         1545607476.957],
+        [loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'),
+         {'attrib-starts': [('PhotoImage',
+                             69),
+                            ('PhotoImage.paste',
+                             155)],
+          'first-line': 167L,
           'folded-linenos': [],
-          'sel-line': 197L,
-          'sel-line-start': 7793L,
-          'selection_end': 7838L,
-          'selection_start': 7793L,
+          'sel-line': 184L,
+          'sel-line-start': 5644L,
+          'selection_end': 5668L,
+          'selection_start': 5665L,
           'zoom': 0L},
-         1539298803.499],
-        [loc('sources/replay.py'),
+         1545607477.945],
+        [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             220)],
-          'first-line': 402L,
-          'folded-linenos': [70L,
-                             89L,
-                             143L,
-                             166L,
-                             284L],
-          'sel-line': 412L,
-          'sel-line-start': 20394L,
-          'selection_end': 20394L,
-          'selection_start': 20394L,
-          'zoom': 0L},
-         1539298809.481],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.show_desc',
-                             196)],
-          'first-line': 186L,
-          'folded-linenos': [],
-          'sel-line': 198L,
-          'sel-line-start': 7838L,
-          'selection_end': 7846L,
-          'selection_start': 7846L,
+                             32),
+                            ('Source.get_content',
+                             62)],
+          'first-line': 104L,
+          'folded-linenos': [159L],
+          'sel-line': 106L,
+          'sel-line-start': 4768L,
+          'selection_end': 4862L,
+          'selection_start': 4850L,
           'zoom': 0L},
-         1539298830.092],
-        [loc('sources/replay.py'),
+         1545607481.611],
+        [loc('sources/filmas.py'),
          {'attrib-starts': [('Source',
-                             31),
+                             36),
                             ('Source.get_streams',
-                             220)],
-          'first-line': 165L,
-          'folded-linenos': [70L,
-                             89L,
-                             143L,
-                             166L,
-                             284L],
-          'sel-line': 221L,
-          'sel-line-start': 11331L,
-          'selection_end': 11331L,
-          'selection_start': 11331L,
-          'zoom': 0L},
-         1539298837.49],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.list_action',
-                             106)],
-          'first-line': 105L,
+                             108)],
+          'first-line': 159L,
           'folded-linenos': [],
-          'sel-line': 110L,
-          'sel-line-start': 4515L,
-          'selection_end': 4527L,
-          'selection_start': 4527L,
+          'sel-line': 168L,
+          'sel-line-start': 7362L,
+          'selection_end': 7404L,
+          'selection_start': 7404L,
           'zoom': 0L},
-         1541625173.974],
-        [loc('sources/lmt.py'),
+         1545607482.317],
+        [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
-                             52)],
-          'first-line': 64L,
-          'folded-linenos': [],
-          'sel-line': 60L,
-          'sel-line-start': 1987L,
-          'selection_end': 2043L,
-          'selection_start': 2043L,
+                             62)],
+          'first-line': 104L,
+          'folded-linenos': [159L],
+          'sel-line': 106L,
+          'sel-line-start': 4768L,
+          'selection_end': 4862L,
+          'selection_start': 4850L,
           'zoom': 0L},
-         1541625181.585],
-        [loc('sources/lmt.py'),
+         1545607483.324],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
+                            ('Source.get_content',
+                             56)],
+          'first-line': 142L,
+          'folded-linenos': [179L,
+                             270L],
+          'sel-line': 149L,
+          'sel-line-start': 6166L,
+          'selection_end': 6203L,
+          'selection_start': 6203L,
+          'zoom': 0L},
+         1545609588.231],
+        [loc('sources/filmix.py'),
+         {'attrib-starts': [('Source',
+                             31),
                             ('Source.get_streams',
-                             134)],
-          'first-line': 201L,
-          'folded-linenos': [],
-          'sel-line': 211L,
-          'sel-line-start': 9396L,
-          'selection_end': 9396L,
-          'selection_start': 9396L,
+                             270)],
+          'first-line': 343L,
+          'folded-linenos': [179L],
+          'sel-line': 359L,
+          'sel-line-start': 15961L,
+          'selection_end': 15961L,
+          'selection_start': 15961L,
           'zoom': 0L},
-         1541629753.532],
+         1545611652.114],
         [loc('run.py'),
          {'attrib-starts': [('Main',
                              22),
                             ('Main.play_video',
                              242)],
-          'first-line': 238L,
+          'first-line': 251L,
           'folded-linenos': [],
-          'sel-line': 254L,
-          'sel-line-start': 9998L,
-          'selection_end': 10010L,
-          'selection_start': 10010L,
+          'sel-line': 264L,
+          'sel-line-start': 10425L,
+          'selection_end': 10425L,
+          'selection_start': 10425L,
           'zoom': 0L},
-         1541629764.649],
-        [loc('sources/lmt.py'),
+         1545611733.467],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
+                            ('Source.get_content',
+                             56)],
+          'first-line': 99L,
+          'folded-linenos': [179L],
+          'sel-line': 76L,
+          'sel-line-start': 2487L,
+          'selection_end': 2487L,
+          'selection_start': 2487L,
+          'zoom': 0L},
+         1545611946.253],
+        [loc('sources/filmix.py'),
+         {'attrib-starts': [('Source',
+                             31),
                             ('Source.get_streams',
-                             134)],
-          'first-line': 210L,
-          'folded-linenos': [],
-          'sel-line': 220L,
-          'sel-line-start': 9851L,
-          'selection_end': 9863L,
-          'selection_start': 9863L,
+                             270)],
+          'first-line': 298L,
+          'folded-linenos': [321L],
+          'sel-line': 318L,
+          'sel-line-start': 14037L,
+          'selection_end': 14037L,
+          'selection_start': 14037L,
           'zoom': 0L},
-         1541630517.409],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.play_video',
-                             242)],
-          'first-line': 238L,
-          'folded-linenos': [],
-          'sel-line': 254L,
-          'sel-line-start': 9998L,
-          'selection_end': 10010L,
-          'selection_start': 10010L,
+         1545613448.203],
+        [loc('sources/ltc.py'),
+         {'attrib-starts': [('Source',
+                             26),
+                            ('Source.get_stream_url2',
+                             984)],
+          'first-line': 66L,
+          'folded-linenos': [132L,
+                             161L,
+                             221L,
+                             232L,
+                             258L,
+                             277L,
+                             296L,
+                             320L,
+                             350L,
+                             351L,
+                             399L,
+                             412L,
+                             532L],
+          'sel-line': 1004L,
+          'sel-line-start': 52035L,
+          'selection_end': 52085L,
+          'selection_start': 52085L,
           'zoom': 0L},
-         1541630539.167],
-        [loc('sources/lmt.py'),
+         1545613550.475],
+        [loc('sources/ltc.py'),
          {'attrib-starts': [('Source',
-                             32),
-                            ('Source.get_streams',
-                             134)],
-          'first-line': 210L,
-          'folded-linenos': [],
-          'sel-line': 220L,
-          'sel-line-start': 9851L,
-          'selection_end': 9851L,
-          'selection_start': 9851L,
+                             26),
+                            ('Source.get_stream_url2',
+                             984)],
+          'first-line': 1008L,
+          'folded-linenos': [132L,
+                             161L,
+                             221L,
+                             232L,
+                             258L,
+                             277L,
+                             296L,
+                             320L,
+                             350L,
+                             351L,
+                             399L,
+                             412L,
+                             532L],
+          'sel-line': 1018L,
+          'sel-line-start': 52714L,
+          'selection_end': 52739L,
+          'selection_start': 52733L,
           'zoom': 0L},
-         1541630562.637],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.get_streams',
-                             96)],
-          'first-line': 104L,
-          'folded-linenos': [],
-          'sel-line': 115L,
-          'sel-line-start': 4877L,
-          'selection_end': 4877L,
-          'selection_start': 4877L,
+         1545613552.544],
+        [loc('sources/ltc.py'),
+         {'attrib-starts': [('Source',
+                             26),
+                            ('Source.get_streams',
+                             572)],
+          'first-line': 637L,
+          'folded-linenos': [132L,
+                             161L,
+                             221L,
+                             232L,
+                             258L,
+                             277L,
+                             296L,
+                             320L,
+                             350L,
+                             351L,
+                             399L,
+                             412L,
+                             532L],
+          'sel-line': 646L,
+          'sel-line-start': 37498L,
+          'selection_end': 37506L,
+          'selection_start': 37506L,
           'zoom': 0L},
-         1541630579.16],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.play_video',
-                             242)],
-          'first-line': 248L,
+         1545613598.407],
+        [loc('sources/filmix.py'),
+         {'attrib-starts': [('Source',
+                             31),
+                            ('Source.get_streams',
+                             270)],
+          'first-line': 349L,
           'folded-linenos': [],
-          'sel-line': 260L,
-          'sel-line-start': 10228L,
-          'selection_end': 10262L,
-          'selection_start': 10262L,
+          'sel-line': 351L,
+          'sel-line-start': 15581L,
+          'selection_end': 15640L,
+          'selection_start': 15640L,
           'zoom': 0L},
-         1541630605.709]],
+         1545613904.974]],
         20),
-        'current-loc': loc('run.py'),
+        'current-loc': loc('sources/filmix.py'),
         'editor-state-list': [(loc('run.py'),
                                {'attrib-starts': [('Main',
         22),
-        ('Main.show_desc',
-         196)],
-                                'first-line': 186L,
+        ('Main.play_video',
+         242)],
+                                'first-line': 251L,
                                 'folded-linenos': [],
-                                'sel-line': 197L,
-                                'sel-line-start': 7793L,
-                                'selection_end': 7793L,
-                                'selection_start': 7793L,
+                                'sel-line': 264L,
+                                'sel-line-start': 10425L,
+                                'selection_end': 10425L,
+                                'selection_start': 10425L,
                                 'zoom': 0L}),
                               (loc('util.py'),
                                {'attrib-starts': [('unescape',
@@ -1392,9 +1410,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                               (loc('sources/ltc.py'),
                                {'attrib-starts': [('Source',
         26),
-        ('Source.get_stream_url2',
-         978)],
-                                'first-line': 989L,
+        ('Source.get_streams',
+         572)],
+                                'first-line': 637L,
                                 'folded-linenos': [132L,
         161L,
         221L,
@@ -1408,10 +1426,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         399L,
         412L,
         532L],
-                                'sel-line': 998L,
-                                'sel-line-start': 51732L,
-                                'selection_end': 51782L,
-                                'selection_start': 51782L,
+                                'sel-line': 646L,
+                                'sel-line-start': 37498L,
+                                'selection_end': 37506L,
+                                'selection_start': 37506L,
                                 'zoom': 0L}),
                               (loc('sources/replay.py'),
                                {'attrib-starts': [('Source',
@@ -1430,13 +1448,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 11331L,
                                 'zoom': 0L}),
                               (loc('sources/tvplay.py'),
-                               {'attrib-starts': [],
-                                'first-line': 0L,
+                               {'attrib-starts': [('Source',
+        32),
+        ('Source.get_content',
+         62)],
+                                'first-line': 104L,
                                 'folded-linenos': [159L],
-                                'sel-line': 14L,
-                                'sel-line-start': 421L,
-                                'selection_end': 431L,
-                                'selection_start': 431L,
+                                'sel-line': 106L,
+                                'sel-line-start': 4768L,
+                                'selection_end': 4862L,
+                                'selection_start': 4850L,
                                 'zoom': 0L}),
                               (loc('sources/euronews.py'),
                                {'attrib-starts': [('Source',
@@ -1474,26 +1495,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                               (loc('sources/filmix.py'),
                                {'attrib-starts': [('Source',
         31),
-        ('Source.process_list',
-         191)],
-                                'first-line': 189L,
-                                'folded-linenos': [],
-                                'sel-line': 204L,
-                                'sel-line-start': 9180L,
-                                'selection_end': 9216L,
-                                'selection_start': 9216L,
-                                'zoom': 0L}),
-                              (loc('sources/filmas.py'),
-                               {'attrib-starts': [('Source',
-        36),
         ('Source.get_streams',
-         108)],
-                                'first-line': 159L,
+         270)],
+                                'first-line': 275L,
                                 'folded-linenos': [],
-                                'sel-line': 169L,
-                                'sel-line-start': 7404L,
-                                'selection_end': 7404L,
-                                'selection_start': 7404L,
+                                'sel-line': 280L,
+                                'sel-line-start': 12065L,
+                                'selection_end': 12065L,
+                                'selection_start': 12065L,
                                 'zoom': 0L}),
                               (loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
                                {'attrib-starts': [],
@@ -1539,22 +1548,21 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/config.py'),
          loc('changelog.md'),
          loc('sources/filmix.py'),
-         loc('sources/filmas.py'),
          loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
          loc('sources/lmt.py'),
          loc('ContentSources.py')]),
-                               'open_files': [u'changelog.md',
+                               'open_files': [u'ContentSources.py',
+        u'changelog.md',
         u'sources/config.py',
         u'sources/euronews.py',
-        u'sources/filmas.py',
-        u'sources/filmix.py',
-        u'sources/ltc.py',
+        u'sources/lmt.py',
         u'sources/replay.py',
-        u'sources/tvplay.py',
         u'util.py',
         u'../../../../../Python27/Lib/site-packages/PIL/Image.py',
-        u'sources/lmt.py',
-        u'run.py']},
+        u'sources/tvplay.py',
+        u'run.py',
+        u'sources/ltc.py',
+        u'sources/filmix.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.5388225255972696},
         'splits': 2,
@@ -1565,21 +1573,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                  'splits': 2,
                  'tab_location': 'left',
                  'user_data': {}},
-        'window-alloc': (167,
+        'window-alloc': (128,
                          0,
-                         2393,
+                         2432,
                          1440)}]}
-guimgr.recent-documents = [loc('run.py'),
-                           loc('ContentSources.py'),
-                           loc('sources/lmt.py'),
+guimgr.recent-documents = [loc('sources/filmix.py'),
+                           loc('sources/ltc.py'),
+                           loc('run.py'),
+                           loc('sources/tvplay.py'),
                            loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
+                           loc('sources/lmt.py'),
                            loc('sources/replay.py'),
-                           loc('sources/ltc.py'),
                            loc('util.py'),
-                           loc('sources/tvplay.py'),
                            loc('sources/euronews.py'),
-                           loc('sources/filmix.py'),
-                           loc('sources/filmas.py'),
                            loc('changelog.md'),
                            loc('sources/config.py')]
 guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
@@ -1888,14 +1894,14 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'zoom': 0L},
                        loc('sources/filmas.py'): {'attrib-starts': [('Source',
         36),
-        ('Source.__init__',
-         38)],
-        'first-line': 42L,
+        ('Source.get_streams',
+         108)],
+        'first-line': 159L,
         'folded-linenos': [],
-        'sel-line': 44L,
-        'sel-line-start': 1330L,
-        'selection_end': 1369L,
-        'selection_start': 1369L,
+        'sel-line': 168L,
+        'sel-line-start': 7362L,
+        'selection_end': 7404L,
+        'selection_start': 7404L,
         'zoom': 0L},
                        loc('sources/filmix.py'): {'attrib-starts': [('Source',
         31),
@@ -2134,6 +2140,18 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'sel-line-start': 1389L,
         'selection_end': 1434L,
         'selection_start': 1434L,
+        'zoom': 0L},
+                       loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'): {'a'\
+        'ttrib-starts': [('PhotoImage',
+                          69),
+                         ('PhotoImage.paste',
+                          155)],
+        'first-line': 167L,
+        'folded-linenos': [],
+        'sel-line': 184L,
+        'sel-line-start': 5644L,
+        'selection_end': 5668L,
+        'selection_start': 5665L,
         'zoom': 0L},
                        loc('../../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
         'ttrib-starts': [('HTTPAdapter',
@@ -2220,7 +2238,14 @@ search.replace-history = [u'filmix.co',
                           u'https://replay.lsm.lv',
                           u'www.shortcut.lv',
                           u'shortcut.lv']
-search.search-history = [u' for item in r["content"]:',
+search.search-history = [u'sorted',
+                         u'self.kategorijas',
+                         u'kategorijas',
+                         u'"playlist"',
+                         u'translations',
+                         u'134',
+                         u'decode_direct_media_url',
+                         u' for item in r["content"]:',
                          u'sort=',
                          u'raidijumi/kategorijas',
                          u'tvSeries/category/id/33?type=tvseries&',
@@ -2232,14 +2257,7 @@ search.search-history = [u' for item in r["content"]:',
                          u'title =',
                          u'title',
                          u'nfo',
-                         u'"nfo"',
-                         u'datetime',
-                         u'offset',
-                         u'filmix\\.m',
-                         u'filmix.me',
-                         u'1.4',
-                         u'1.3',
-                         u'img =']
+                         u'"nfo"']
 testing.stored-results = (1,
                           [],
                           {})

sources/filmix.py

@@ -131,7 +131,13 @@ Cookie: FILMIXNET=%s;
             m = re.search(r"meta_key = \['(\w+)', '(\w+)', '(\w+)'\]", r, re.IGNORECASE)
             key = m.group(3) if m else ""
             js = self.get_movie_info(vid,key)
-            translations = js["message"]["translations"]["html5"]
+            #translations = js["message"]["translations"]["html5"]
+            if "html5" in  js["message"]["translations"]:
+                translations = js["message"]["translations"]["html5"]
+            else:
+                translations = js["message"]["translations"]
+                translations = js["message"]["translations"]["video"]
+
             items = []
             for pl  in translations:
                 if translations[pl].startswith("http"):
@@ -139,29 +145,30 @@ Cookie: FILMIXNET=%s;
                 pl_link = translations[pl]
                 lang = pl.encode("utf8")
                 pl_link = self.decode_direct_media_url(pl_link)
-                js = self._http_request(pl_link)
-                js = self.decode_direct_media_url(js)
-                js = json.loads(js)
-                if "s" in qs:
+                stxt = self._http_request(pl_link)
+                stxt = self.decode_direct_media_url(stxt)
+                js = json.loads(stxt)
+                if "s" in qs:  # season, enumerate episodes
                     s = int(qs["s"])
-                    if s > len(js["playlist"]): continue
-                    for i,ep in enumerate(js["playlist"][s-1]["playlist"]):
-                        title = title0+" - "+js["playlist"][s-1]["playlist"][i]["comment"].encode("utf8")
-                        serie = js["playlist"][s-1]["playlist"][i]["comment"].encode("utf8")
+                    if s > len(js): continue
+                    for i,ep in enumerate(js[s-1]["folder"]):
+                        title2 = js[s-1]["folder"][i]["title"].encode("utf8")
+                        title = title0+" - "+ title2
+                        title_season = js[s-1]["title"].encode("utf8")
                         data2 = data+"&e=%s"%(i+1)
-                        desc = serie +"\n"+desc0
+                        desc = title2 +"\n"+desc0
                         if data2 not in items:
                             items.append(data2)
                             content.append((title,self.name+"::"+data2,img,desc))
-                else:
-                    for i,ep in enumerate(js["playlist"]):
-                        title = title0 +" - "+js["playlist"][i]["comment"].encode("utf8")
-                        serie = js["playlist"][i]["comment"].encode("utf8")
-                        if "file" in ep and ep["file"]:
+                else:  # enumerate seasons
+                    for i, se in enumerate(js):
+                        title2 = se["title"].encode("utf8")
+                        title = title0 +" - " + title2
+                        if "file" in se and se["file"]:
                             data2 = data+"?e=%s"%(i+1)
                         else:
                             data2 = data+"?s=%s"%(i+1)
-                        desc = serie +"\n"+desc0
+                        desc = title2 +"\n"+desc0
                         if data2 not in items:
                             items.append(data2)
                             content.append((title,self.name+"::"+data2,img,desc))
@@ -270,13 +277,16 @@ Cookie: FILMIXNET=%s;
             return []
         streams = []
         r = r.decode("cp1251").encode("utf8")
-        title = title0 = util.unescape(re.search("titlePlayer = '([^']+)'", r, re.DOTALL).group(1))
-        m = re.search('<meta itemprop="thumbnailUrl" content="([^"]+)',r,re.DOTALL)
-        img = m.group(1) if m else self.img
-        m = re.search('<meta itemprop="duration" content="([^"]+)" />', r, re.DOTALL)
-        duration = "(%s)"%m.group(1) if m else ""
-        m = re.search('<p itemprop="description"[^>]+>([^<]+)<', r, re.DOTALL)
-        desc = desc0 =  util.unescape(m.group(1).strip()) if m else ""
+        try:
+            title = title0 = util.unescape(re.search("titlePlayer = '([^']+)'", r, re.DOTALL).group(1))
+            m = re.search('<meta itemprop="thumbnailUrl" content="([^"]+)',r,re.DOTALL)
+            img = m.group(1) if m else self.img
+            m = re.search('<meta itemprop="duration" content="([^"]+)" />', r, re.DOTALL)
+            duration = "(%s)"%m.group(1) if m else ""
+            m = re.search('<p itemprop="description"[^>]+>([^<]+)<', r, re.DOTALL)
+            desc = desc0 =  util.unescape(m.group(1).strip()) if m else ""
+        except:
+            raise Exception("No stream found")
         #m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
         #if not m:
         #    raise Exception("Can not find video link")
@@ -287,7 +297,11 @@ Cookie: FILMIXNET=%s;
         key = m.group(3) if m else ""
         js =  self.get_movie_info(vid, key)
         series = True if js["message"]["translations"]["pl"] == "yes" else False
-        translations = js["message"]["translations"]["html5"]
+        if "html5" in  js["message"]["translations"]:
+            translations = js["message"]["translations"]["html5"]
+        else:
+            translations = js["message"]["translations"]
+            translations = js["message"]["translations"]["video"]
 
         if not series : # Filma
             for pl in translations:
@@ -305,8 +319,10 @@ Cookie: FILMIXNET=%s;
                     stream["name"]= title
                     stream["desc"]=desc
                     stream["img"] = img
+                    m = re.search("\d+", st[0])
+                    stream["order"] = int(m.group(0)) if m else 0
                     streams.append(stream)
-            return streams
+            #return streams
 
         else: # Seriāls
             for pl in translations:
@@ -320,7 +336,7 @@ Cookie: FILMIXNET=%s;
                 js = self._http_request(pl_link)
                 js = self.decode_direct_media_url(js)
                 js = json.loads(js)
-                playlist =  js["playlist"]
+                playlist =  js
                 if "e" in qs:
                     if "s" in qs:
                         s = int(qs["s"])
@@ -328,10 +344,10 @@ Cookie: FILMIXNET=%s;
                         s = None
                     e = int(qs["e"])
                     if s: # sezona + epizode
-                        if s > len(js["playlist"]) or e > len(js["playlist"][s-1]["playlist"]): continue
-                        serie = js["playlist"][s-1]["playlist"][e-1]["comment"].encode("utf8")
-                        title = title0+" - "+ serie
-                        url0 = js["playlist"][s-1]["playlist"][e-1]["file"].encode("utf8")
+                        if s > len(js) or e > len(js[s-1]["folder"]): continue
+                        title2 = js[s-1]["folder"][e-1]["title"].encode("utf8")
+                        title = title0+" - " + title2
+                        url0 = js[s-1]["folder"][e-1]["file"].encode("utf8")
                     else: # tikai epizode, nav sezonas
                         if e > len(js["playlist"]): continue
                         title = title0 +" - "+js["playlist"][e-1]["comment"].encode("utf8")
@@ -344,9 +360,14 @@ Cookie: FILMIXNET=%s;
                         stream["lang"]=lang
                         stream["quality"]=st[0]
                         stream["name"]= title
+                        stream["img"] = img
                         stream["desc"]=desc
+                        m = re.search("\d+", st[0])
+                        stream["order"] = int(m.group(0)) if m else 0
                         streams.append(stream)
-            return streams
+
+        streams = sorted(streams,key=lambda item: item["order"],reverse=True)
+        return streams
 
     def call(self, data,params=None,headers=None,lang=""):
         if not headers: headers = self.headers
@@ -391,6 +412,15 @@ Cookie: FILMIXNET=%s;
             encoded_url = encoded_url.replace('___', b)
         return base64.b64decode(encoded_url)
 
+    def decode_base64_2(self, encoded_url):
+        tokens = ("//Y2VyY2EudHJvdmEuc2FnZ2V6emE=", "//c2ljYXJpby4yMi5tb3ZpZXM=", "//a2lub2NvdmVyLnc5OC5uamJo")
+        clean_encoded_url = encoded_url[2:].replace("\/","/")
+
+        for token in tokens:
+            clean_encoded_url = clean_encoded_url.replace(token, "")
+
+        return base64.b64decode(clean_encoded_url)
+
     def decode_unicode(self, encoded_url):
         from itertools import izip_longest
         def grouper(n, iterable, fillvalue=None):
@@ -408,14 +438,16 @@ Cookie: FILMIXNET=%s;
 
         try:
             if encoded_url.find('#') != -1:
-                return self.decode_unicode(encoded_url)
+                if encoded_url[:2] == '#2':
+                    return self.decode_base64_2(encoded_url)
+                else:
+                    return self.decode_unicode(encoded_url)
             else:
                 return self.decode_base64(encoded_url)
         except:
             return False
 
 
-
     def decode_uppod_text(self, text):
         Client_codec_a = ["l", "u", "T", "D", "Q", "H", "0", "3", "G", "1", "f", "M", "p", "U", "a", "I", "6", "k", "d", "s", "b", "W", "5", "e", "y", "="]
         Client_codec_b = ["w", "g", "i", "Z", "c", "R", "z", "v", "x", "n", "N", "2", "8", "J", "X", "t", "9", "V", "7", "4", "B", "m", "Y", "o", "L", "h"]
@@ -430,7 +462,8 @@ Cookie: FILMIXNET=%s;
         print result
         return result
 
-    def get_streams2(self,url0):
+    def get_streams2_(self,url0):
+        # Old version
         m = re.search("\[([\d\w,]+)\]",url0)
         if not m:
             return [("?",url0)]
@@ -443,6 +476,22 @@ Cookie: FILMIXNET=%s;
             streams.append((res,url))
         return streams
 
+    def get_streams2(self,url0):
+        m = re.search("\[([\d\w]+)\]",url0)
+        if not m:
+            return [("?",url0)]
+        streams=[]
+        for st in url0.split(","):
+            if not st: continue
+            m = re.search(r"\[([\d\w]+)\]", st)
+            if not m:
+                continue
+            res =  m.group(1)
+            if res in ["1080p"]: continue #TODO fullhd only in PRO+ version
+            url=st.replace(m.group(0), "")
+            streams.append((res,url))
+        return streams
+
 
 if __name__ == "__main__":
 

sources/tvplay.py

@@ -79,19 +79,19 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 
         elif clist in ("meklet"):
             term = plist[1]
-            data = "tvplay::asset/search?size=30&page=0&f_title.title=%s&f_country=LV&f_metadata.contentType=EPISODE" % term
+            data = "tvplay::asset/search?size=30&page=0&f_title.title=%s&f_country=LV&f_metadata.contentType=EPISODE&f_country=LV" % term
             return self.get_content(data)
 
         elif clist in ("tiesraides"):
-            data = "tvplay::asset/search?size=30&page=0&f_metadata.contentType=LIVE"
+            data = "tvplay::asset/search?size=30&page=0&f_metadata.contentType=LIVE&f_country=LV"
             return self.get_content(data)
 
         elif clist == "jaunakais":
             if plist[1] == "epizodes":
-                data = "tvplay::asset/search?f_title.categories=15004&size=30&page=0&f_metadata.contentType=EPISODE"
+                data = "tvplay::asset/search?f_title.categories=15004&size=30&page=0&f_metadata.contentType=EPISODE&f_country=LV"
                 return self.get_content(data)
             elif plist[1] == "klipi":
-                data = "tvplay::asset/search?f_title.categories=15004&size=30&page=0&f_metadata.contentType=CLIP"
+                data = "tvplay::asset/search?f_title.categories=15004&size=30&page=0&f_metadata.contentType=CLIP&f_country=LV"
                 return self.get_content(data)
             elif plist[1] == "kategorijas":
                 for kat in self.kategorijas:
@@ -104,7 +104,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                         break
                 else:
                     return content
-                data = "tvplay::asset/search?f_title.categories=%s&size=30&page=0" % kat_num
+                data = "tvplay::asset/search?f_title.categories=%s&size=30&page=0&f_country=LV" % kat_num
                 return self.get_content(data)
 
         elif clist == "raidijumi":
@@ -120,7 +120,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                         break
                 else:
                     return content
-                data = "tvplay::tvSeries/category/id/%s?type=tvseries&size=500&sort=&descending=true" % kat_num
+                data = "tvplay::tvSeries/category/id/%s?type=tvseries&size=500&sort=&descending=true&tenantId=2" % kat_num
                 return self.get_content(data)
 
         elif path == "asset/search":