filmas salabotas

project.wpr

@@ -134,6 +134,10 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
                      loc('sources/euronews.py'): {161L: (0,
         None,
         1,
+        0)},
+                     loc('sources/filmas.py'): {110L: (0,
+        None,
+        1,
         0)},
                      loc('sources/filmix.py'): {77L: (0,
         None,
@@ -155,10 +159,10 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
         None,
         1,
         0),
-        208L: (0,
-               None,
-               1,
-               0),
+        210: (0,
+              None,
+              1,
+              0),
         231L: (0,
                None,
                1,
@@ -830,17 +834,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'top-node': [('generic attribute',
                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
                       'ADAPTIVE')]},
-        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
@@ -978,25 +982,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 168L,
+                       'first-line': 0L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/replay.py': ['j'\
-        's["player"]["clip"]["sources"][0]["src"]\n',
-        'data\n',
-        'print data\n',
-        'm.group(1)\n',
-        'headers\n',
-        'print r3\n',
-        'url3\n',
-        'print url3\n',
-        '"m3u8" in r3\n',
-        'print data2\n',
-        'print r\n']},
+                       'history': {},
                        'launch-id': None,
-                       'sel-line': 181L,
-                       'sel-line-start': 7571L,
-                       'selection_end': 7571L,
-                       'selection_start': 7571L,
+                       'sel-line': 0L,
+                       'sel-line-start': 0L,
+                       'selection_end': 0L,
+                       'selection_start': 0L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -1044,145 +1037,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'selection_end': 174L,
                        'selection_start': 174L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/replay.py'),
-        {'attrib-starts': [('Source',
-                            31),
-                           ('Source.get_content',
-                            42)],
-         'first-line': 115L,
-         'folded-linenos': [49L,
-                            70L,
-                            89L,
-                            102L,
-                            132L,
-                            155L,
-                            212L,
-                            228L,
-                            254L,
-                            282L],
-         'sel-line': 126L,
-         'sel-line-start': 5965L,
-         'selection_end': 6001L,
-         'selection_start': 6001L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
+        {'attrib-starts': [('Main',
+                            22),
+                           ('Main.play_video',
+                            242)],
+         'first-line': 243L,
+         'folded-linenos': [],
+         'sel-line': 254L,
+         'sel-line-start': 9998L,
+         'selection_end': 9998L,
+         'selection_start': 9998L,
          'zoom': 0L},
-        1529011316.587],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             206)],
-          'first-line': 251L,
-          'folded-linenos': [49L,
-                             70L,
-                             89L,
-                             102L,
-                             132L,
-                             155L,
-                             254L,
-                             268L,
-                             279L],
-          'sel-line': 310L,
-          'sel-line-start': 15523L,
-          'selection_end': 15523L,
-          'selection_start': 15523L,
-          'zoom': 0L},
-         1529012433.669],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.play_video',
-                             242)],
-          'first-line': 222L,
-          'folded-linenos': [],
-          'sel-line': 254L,
-          'sel-line-start': 9998L,
-          'selection_end': 9998L,
-          'selection_start': 9998L,
-          'zoom': 0L},
-         1529012441.761],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             206)],
-          'first-line': 218L,
-          'folded-linenos': [49L,
-                             70L,
-                             89L,
-                             102L,
-                             132L,
-                             155L,
-                             254L],
-          'sel-line': 315L,
-          'sel-line-start': 15677L,
-          'selection_end': 15677L,
-          'selection_start': 15677L,
-          'zoom': 0L},
-         1529012607.591],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             206)],
-          'first-line': 223L,
-          'folded-linenos': [49L,
-                             70L,
-                             89L,
-                             102L,
-                             132L,
-                             155L,
-                             228L],
-          'sel-line': 258L,
-          'sel-line-start': 13160L,
-          'selection_end': 13160L,
-          'selection_start': 13160L,
-          'zoom': 0L},
-         1529012826.297],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.play_video',
-                             242)],
-          'first-line': 243L,
-          'folded-linenos': [],
-          'sel-line': 254L,
-          'sel-line-start': 9998L,
-          'selection_end': 9998L,
-          'selection_start': 9998L,
-          'zoom': 0L},
-         1529012838.028],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_streams',
-                             206)],
-          'first-line': 223L,
-          'folded-linenos': [49L,
-                             70L,
-                             89L,
-                             102L,
-                             132L,
-                             155L,
-                             228L],
-          'sel-line': 256L,
-          'sel-line-start': 13027L,
-          'selection_end': 13028L,
-          'selection_start': 13028L,
-          'zoom': 0L},
-         1529260759.969],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.play_video',
-                             242)],
-          'first-line': 243L,
-          'folded-linenos': [],
-          'sel-line': 254L,
-          'sel-line-start': 9998L,
-          'selection_end': 9998L,
-          'selection_start': 9998L,
-          'zoom': 0L},
-         1529260772.909],
+        1529260772.909],
         [loc('ContentSources.py'),
          {'attrib-starts': [('ContentSources',
                              16),
@@ -1380,9 +1247,101 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'selection_end': 11592L,
           'selection_start': 11592L,
           'zoom': 0L},
-         1529784296.575]],
+         1529784296.575],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             31),
+                            ('Source.get_streams',
+                             209)],
+          'first-line': 250L,
+          'folded-linenos': [49L,
+                             70L,
+                             89L,
+                             102L,
+                             132L,
+                             155L],
+          'sel-line': 260L,
+          'sel-line-start': 13355L,
+          'selection_end': 13355L,
+          'selection_start': 13355L,
+          'zoom': 0L},
+         1529839917.518],
+        [loc('sources/filmas.py'),
+         {'attrib-starts': [('Source',
+                             36),
+                            ('Source.get_content',
+                             59)],
+          'first-line': 211L,
+          'folded-linenos': [],
+          'sel-line': 72L,
+          'sel-line-start': 2912L,
+          'selection_end': 3002L,
+          'selection_start': 3002L,
+          'zoom': 0L},
+         1529840048.66],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [],
+          'first-line': 384L,
+          'folded-linenos': [49L,
+                             70L,
+                             89L,
+                             102L,
+                             132L,
+                             155L],
+          'sel-line': 388L,
+          'sel-line-start': 19109L,
+          'selection_end': 19327L,
+          'selection_start': 19109L,
+          'zoom': 0L},
+         1529840061.689],
+        [loc('sources/filmas.py'),
+         {'attrib-starts': [],
+          'first-line': 224L,
+          'folded-linenos': [],
+          'sel-line': 220L,
+          'sel-line-start': 9464L,
+          'selection_end': 9482L,
+          'selection_start': 9482L,
+          'zoom': 0L},
+         1529840151.336],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [],
+          'first-line': 384L,
+          'folded-linenos': [49L,
+                             70L,
+                             89L,
+                             102L,
+                             132L,
+                             155L],
+          'sel-line': 388L,
+          'sel-line-start': 19109L,
+          'selection_end': 19327L,
+          'selection_start': 19109L,
+          'zoom': 0L},
+         1529840156.41],
+        [loc('sources/filmas.py'),
+         {'attrib-starts': [],
+          'first-line': 230L,
+          'folded-linenos': [],
+          'sel-line': 240L,
+          'sel-line-start': 10133L,
+          'selection_end': 10133L,
+          'selection_start': 10133L,
+          'zoom': 0L},
+         1529840172.146],
+        [loc('sources/filmas.py'),
+         {'attrib-starts': [('Source',
+                             36)],
+          'first-line': 28L,
+          'folded-linenos': [],
+          'sel-line': 36L,
+          'sel-line-start': 1035L,
+          'selection_end': 1047L,
+          'selection_start': 1041L,
+          'zoom': 0L},
+         1529840175.605]],
         20),
-        'current-loc': loc('sources/replay.py'),
+        'current-loc': loc('sources/filmas.py'),
         'editor-state-list': [(loc('run.py'),
                                {'attrib-starts': [('Main',
         22),
@@ -1438,21 +1397,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 47188L,
                                 'zoom': 0L}),
                               (loc('sources/replay.py'),
-                               {'attrib-starts': [('Source',
-        31),
-        ('Source.get_streams',
-         206)],
-                                'first-line': 247L,
+                               {'attrib-starts': [],
+                                'first-line': 384L,
                                 'folded-linenos': [49L,
         70L,
         89L,
         102L,
         132L,
         155L],
-                                'sel-line': 257L,
-                                'sel-line-start': 13118L,
-                                'selection_end': 13118L,
-                                'selection_start': 13118L,
+                                'sel-line': 388L,
+                                'sel-line-start': 19109L,
+                                'selection_end': 19327L,
+                                'selection_start': 19109L,
                                 'zoom': 0L}),
                               (loc('sources/lmt.py'),
                                {'attrib-starts': [('Source',
@@ -1516,8 +1472,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'sel-line-start': 5356L,
                                 'selection_end': 5392L,
                                 'selection_start': 5389L,
+                                'zoom': 0L}),
+                              (loc('sources/filmas.py'),
+                               {'attrib-starts': [('Source',
+        36),
+        ('Source.get_streams',
+         108)],
+                                'first-line': 159L,
+                                'folded-linenos': [],
+                                'sel-line': 169L,
+                                'sel-line-start': 7404L,
+                                'selection_end': 7404L,
+                                'selection_start': 7404L,
                                 'zoom': 0L})],
-        'has-focus': True,
+        'has-focus': False,
         'locked': False},
         [loc('run.py'),
          loc('util.py'),
@@ -1528,17 +1496,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('resolver.py'),
          loc('sources/config.py'),
          loc('changelog.md'),
-         loc('sources/filmix.py')]),
+         loc('sources/filmix.py'),
+         loc('sources/filmas.py')]),
                                'open_files': [u'changelog.md',
         u'resolver.py',
+        u'run.py',
         u'sources/config.py',
         u'sources/euronews.py',
         u'sources/filmix.py',
         u'sources/lmt.py',
         u'sources/ltc.py',
         u'util.py',
-        u'run.py',
-        u'sources/replay.py']},
+        u'sources/replay.py',
+        u'sources/filmas.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.47474747474747475},
         'splits': 2,
@@ -1553,9 +1523,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2431,
                          1440)}]}
-guimgr.recent-documents = [loc('sources/replay.py'),
-                           loc('run.py'),
+guimgr.recent-documents = [loc('sources/filmas.py'),
+                           loc('sources/replay.py'),
                            loc('util.py'),
+                           loc('run.py'),
                            loc('sources/ltc.py'),
                            loc('sources/filmix.py'),
                            loc('sources/lmt.py'),

sources/filmas.py

@@ -37,7 +37,7 @@ headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitli
 class Source(SourceBase):
 
     def __init__(self, country="",cfg_path=None):
-        self.hidden = True # nerāda menu nestrādājošos avotus
+        self.hidden = False # nerāda menu nestrādājošos avotus
         self.name = "filmas"
         self.title = "Filmas.lv"
         self.img = "filmas.png"
@@ -66,11 +66,11 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         if clist=="home":
             content.extend([
                 ("Meklēt", "filmas::filmu-katalogs/?mn={0}&tab=movies&sub_tab=movies-search","","Meklēt"),
-                ("Visas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2","","Visur skatam visas filmas"),
-                ("Spēlfilmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=112","","Visur skatamās spēlfilmas"),
-                ("Animācijas filmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=113","","Visur skatamās animācijas filmas"),
-                ("Dokumentalās filmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=111","","Visur skatamās dokumentalās filmas"),
-                ("Kinohronikas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=150","","Visur skatamās kinohronikas")    ,
+                ("Visas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-1","","Visur skatam visas filmas"),
+                ("Spēlfilmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-1&mp20=112","","Visur skatamās spēlfilmas"),
+                ("Animācijas filmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-1&mp20=113","","Visur skatamās animācijas filmas"),
+                ("Dokumentalās filmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-1&mp20=111","","Visur skatamās dokumentalās filmas"),
+                ("Kinohronikas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-1&mp20=150","","Visur skatamās kinohronikas")    ,
             ])
             return content
 
@@ -152,17 +152,18 @@ Referer: https://www.filmas.lv/movie/%s/
 
             ### Key request ###
             headers["Origin"] = "https://www.filmas.lv"
-            r=requests.get(url,headers=headers, verify=False)
-            url_key = re.search('#EXT-X-KEY:METHOD=AES-128,URI="(.+?)"', r.content, re.IGNORECASE | re.MULTILINE).group(1)
-            r=requests.get(url_key,headers=headers, cookies={"filmassession":filmassession,"PHPSESSID":phpsessid}, verify=False)
-            key = r.content if not "error" in r.content else ""
+            headers["Cookie"] = 'filmassession=%s; PHPSESSID=%s' % (filmassession, phpsessid)
+            #r=requests.get(url,headers=headers, verify=False)
+            #url_key = re.search('#EXT-X-KEY:METHOD=AES-128,URI="(.+?)"', r.content, re.IGNORECASE | re.MULTILINE).group(1)
+            #r=requests.get(url_key,headers=headers, cookies={"filmassession":filmassession,"PHPSESSID":phpsessid}, verify=False)
+            #key = r.content if not "error" in r.content else ""
 
             stream = util.item()
             stream["name"] = title
             stream["url"] = url
             stream["img"] = img
             stream["desc"] = desc
-            stream["headers"] = {"key":binascii.b2a_hex(key)}
+            stream["headers"] = headers #{"key":binascii.b2a_hex(key)}
             stream["quality"] = h[2]
             stream["order"] = int(h[1])
             stream["resolver"] = "filmas"
@@ -214,22 +215,24 @@ def download_hls(url, title, download_dir="", headers=None, overwrite=True):
 
 
 if __name__ == "__main__":
+
     #url = "http://localhost:88/https%3A//as2.filmas.lv/FilmasLV/508D4024A83FDC1AA61D727DE5046D12/index-f3-v1-a1.m3u8?~key=4cb5c12b2aaa3d2cf211583cc9add2dd"
     #download_hls(url, "video", "")
 
-    c = Source()
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "movie/3112/"
-    if "movie" in data:
-        if data.startswith("http"):
-            data = data.replace("https://www.filmas.lv/","")
-        streams = c.get_streams(data)
-        #for s in streams:
-        s = streams[0]
-        download_hls(s["url"],"%s %s"%(s["name"],s["quality"]),"",s["headers"])
-        sys.exit()
+#     c = Source()
+#     if len(sys.argv)>1:
+#         data= sys.argv[1]
+#     else:
+#         data = "movie/3112/"
+#     if "movie" in data:
+#         if data.startswith("http"):
+#             data = data.replace("https://www.filmas.lv/","")
+#         streams = c.get_streams(data)
+#         #for s in streams:
+#         s = streams[0]
+#         download_hls(s["url"],"%s %s"%(s["name"],s["quality"]),"",s["headers"])
+#         sys.exit()
+
     sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
     import run
     source = Source()