labojumi pēc instalēšanas

playstreamproxy.py

@@ -110,6 +110,10 @@ class StreamHandler(BaseHTTPRequestHandler):
         #
         print "\n\n"+40*"#"+"\nget_url: \n%s" % self.path
         cmd, data, headers, qs = streamproxy_decode3(self.path)
+
+        print "cmd=", cmd,
+        print " data=", data
+        print_headers(qs)
         if KEY:
             key = qs["key"] if "key" in qs else ""
             if key <> KEY:
@@ -118,8 +122,7 @@ class StreamHandler(BaseHTTPRequestHandler):
                 self.write_error(404)
                 return
         if DEBUG:
-            print "cmd=%s"%cmd
-            print "Original request headers + url headers:"
+            print "=== Headers:"
             print_headers(self.headers.dict)
         self.protocol_version = 'HTTP/1.1'
         try:
@@ -219,6 +222,8 @@ class StreamHandler(BaseHTTPRequestHandler):
 
         headers2 = headers if headers else self.headers.dict
         headers2 = del_headers(headers2, ["host"])
+        # if ".ts" in url:
+        #    print url
         r = self.get_page_ses(url,ses,True,headers = headers2)
         code = r.status_code
         if not code in (200,206): # TODO 206 apstrāde!

sources/filmas.py

@@ -65,25 +65,38 @@ 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-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")    ,
+                ("Meklēt", "filmas::lmdb/api/search/?term={0}","","Meklēt"),
+                ("Visas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-all&watch=latvia&pg=1","","Latvijā skatamās visas filmas"),
+                ("Spēlfilmas", "filmu-katalogs/?tab=movies&sub_tab=movies-all&mp20=112&watch=latvia&pg=1","","Latvijā skatamās spēlfilmas"),
+                ("Dokumentalās filmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-hronika&pg=1","","Latvijā skatamās kinohronikas")    ,
+                ("Animācijas filmas", "filmu-katalogs/?tab=movies&sub_tab=movies-all&mp20=113&watch=latvia&pg=1","","Latvijā skatamās animācijas filmas"),
+                ("Kinohronikas", "filmas::filmu-katalogs/filmu-katalogs/?tab=movies&sub_tab=movies-hronika","","Latvijā skatamās kinohronikas")    ,
+                ("Pēc alfabēta", "filmas::filmu-katalogs/?ml=A&tab=movies&sub_tab=movies-abc&pg=1","","Latvija skatamās filmas pēc alfabēta")    ,
             ])
             return content
 
+        elif "api/search" in data:
+            r = self.call(data)
+            js = json.loads(r)
+            for it in js:
+                if "type" in it and it["type"] == "movie":
+                    title = it["label"] + "(%s)" % it["year"] if "year" in it else ""
+                    img = ("https://www.filmas.lv/images/movies/" + it["photo"]) if "photo" in it and it["photo"] else ""
+                    desc = title
+                    data2 = "movie/%s" % it["value"]
+                    content.append((title,self.name+"::"+data2,img,desc))
+            return content
+
         elif clist=="filmu-katalogs":
             r=self.call(data)
-            result = re.findall(r'<a href="/(movie/\d+)">.+?<img src="/([^"]+)">.+?Pieejama.+?<div class="katalogs-filma-teksts">\s*(.+?)\s*<span style="font-weight:normal; ">\((\d+)\)</span>', r, re.DOTALL)
+            result = re.findall(r'<a href="/(movie/\d+)">.+?src="([^"]+)".+?"movie-catalog-title">([^<]+)<.+?"movie-catalog-year">([^<]+)<', r, re.DOTALL)
             for item in result:
                 title = item[2]+' (%s)'%item[3]
                 data2 = item[0]
-                img = self.url + item[1].replace("thumbs_m/","")
+                img = item[1]
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
-            m = re.search(r"<a class='pagenum' href='(\?tab=movies&sub_tab=movies-view-2[^']+)'>&gt;</a>", r, re.DOTALL)
+            m = re.search("<a class='next' href='(.+?)'", r, re.DOTALL)
             if m:
                 data2 = "filmu-katalogs/"+m.group(1)
                 content.append(("Next page",self.name+"::"+data2, "","Next page"))
@@ -118,8 +131,8 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         phpsessid = r.cookies["PHPSESSID"]
 
         ### Main playlist ###
-        hid = re.search('src: "/lmdb/hls/playlist/(\w+).m3u8"', r.content).group(1)
-        url = "https://www.filmas.lv/lmdb/hls/playlist/%s.m3u8"%hid
+        m = re.search('lmdb.video_src = "/(.+?m3u8)"', r.content)
+        url = "https://www.filmas.lv/%s"%m.group(1)
         headers = headers2dict("""
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:51.0) Gecko/20100101 Firefox/51.0
 Accept: */*
@@ -152,6 +165,7 @@ Referer: https://www.filmas.lv/movie/%s/
 
             ### Key request ###
             headers["Origin"] = "https://www.filmas.lv"
+            headers["Referer"] = "https://www.filmas.lv/" + data
             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)

sources/ltc2.py

@@ -76,12 +76,12 @@ Accept-Language: en-US,en;q=0.8
         if clist=="home":
             content.extend([
                 ("TV tiešraides", "ltc::tiesraide","","TV tiešraides"),
-                ("TV arhīvs", "ltc::arhivs","","TV arhīvs atseviškiem kanāliem"),
-                ("Bērnu", "ltc::videonoma/bernu","","Videonomas bērnu filmas un seriāli"),
-                ("Filmas", "ltc::videonoma/filmas","","Videonomas filmas"),
-                ("Premiere filmas", "ltc::videonoma/premiere","","Videonomas premiere filmas"),
-                ("Seriāli", "ltc::videonoma/series","","Videonomas seriāli"),
-                ("360 Play", "ltc::videonoma/360play","","Videonomas lattelecom saturs"),
+                ("TV arhīvs", "ltc::pages/archive","","TV arhīvs atseviškiem kanāliem"),
+                ("Bērnu", "ltc::pages/kids","","Videonomas bērnu filmas un seriāli"),
+                ("Filmas", "ltc::pages/films","","Videonomas filmas"),
+                ("Premiere filmas", "ltc::pages/premiere","","Videonomas premiere filmas"),
+                ("Seriāli", "ltc::pages/series","","Videonomas seriāli"),
+                ("360 Play", "ltc::/pages/360-play","","Videonomas lattelecom saturs"),
                 ("Meklēt", "ltc::search/{0}","","Meklēt visā saturā"), #TODO
             ])
             return content
@@ -96,10 +96,11 @@ Accept-Language: en-US,en;q=0.8
         ### Tiešraides ####
         elif data=="tiesraide":
             now = dt2ts(dt.now())
-            epgs = self.call("content/epgs/?filter[utFrom]=%s&filter[utTo]=%s&include=channel&page[size]=1000" % (now, now))["data"]
+            r = self.call("epgs/?filter[utFrom]=%s&filter[utTo]=%s&include=channel&page[size]=1000" % (now, now))
+            epgs = r["data"]
             for item in self.get_channels():
                 title = item["attributes"]["title"]
-                data2 = "content/live-streams/%s?include=quality"%item["id"]
+                data2 = "live-streams/%s?include=quality"%item["id"]
                 for epg in epgs:
                     if item["id"] == epg["relationships"]["channel"]["data"]["id"]:
                         epg = epg["attributes"]
@@ -122,9 +123,10 @@ Accept-Language: en-US,en;q=0.8
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
 
-        ### TV arhīva sākums ###
-        elif data=="archive" or data=="arhivs":
-            r = self.call("pages/archive/?include=items,items.item")
+
+        ### Pages ###
+        elif clist=="pages" or data=="arhivs":
+            r = self.call(data+"?page[size]=1000")
             for item in r["data"]:
                 title = item["attributes"]["title"]
                 data2 = item["links"]["self"][1:] + "?include=items"
@@ -134,6 +136,18 @@ Accept-Language: en-US,en;q=0.8
             return content
 
 
+        ### Kategorija ###
+        elif clist=="categories" and len(plist) > 1:
+            r = self.call(data)
+            for item in r["items"]:
+                title = item["name"]
+                data2 = "archive/records?filter[category]=%s&limit=40"%item["id"]
+                img = "https://manstv.lattelecom.tv/"+ item['image']
+                desc = title
+                content.append((title,self.name+"::"+data2,img,desc))
+            return content
+
+
         ### Arhīva kategorijas
         elif data=="archive/categories":
             #https://manstv.lattelecom.tv/api/v1.3/get/archive/records/?filter[category]=13&limit=10&until_id=1458681019238
@@ -635,12 +649,10 @@ Accept-Language: en-US,en;q=0.8
         return streams
 
     def is_video(self,data):
-        if "::" in data:
-            data = data.split("::")[1]
-        cmd = data.split("/")
+        source, data, path, plist, clist, params, qs = self.parse_data(data)
         if "get-stream" in data:
             return True
-        elif cmd[0] in ("content") and cmd[1] in ("live-streams","record-streams","vod-streams", "catchup"):
+        if clist in ("live-streams","record-streams","vod-streams", "catchup"):
             return True
         elif cmd[0]=="arhivs" and len(cmd)==4:
             return True
@@ -654,7 +666,7 @@ Accept-Language: en-US,en;q=0.8
             return self.ch
         #if not self.check_logedin():
         #    self.login() # citādi nerāda TV3, LNT, TV6
-        r= self.call("content/channels?page[size]=1000&&filter[state]=1")
+        r= self.call("channels?page[size]=1000&&filter[state]=1")
         self.ch=[]
         for i,item in enumerate(r["data"]):
             self.ch.append(item)