salabots shortcut videonoma

changelog.md

@@ -1,3 +1,7 @@
+**10.04.2018**:
+- salaboti shortcut.lv videonomas saraksti
+
 **10.03.2018**:
-- filmix turlkojumi/srīmi salaboti (nerādīja visas sērijas u.c.)
+- filmix tulkojumi/strīmi salaboti (nerādīja visas sērijas u.c.)
+
 

sources/ltc.py

@@ -47,6 +47,11 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36
 Accept-Language: en-US,en;q=0.8
         """)
+        self.headers3 = headers2dict("""
+User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0
+Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+X-Requested-With: XMLHttpRequest
+        """)
 
         self.channels = None
         ### specific service info ###
@@ -80,12 +85,18 @@ Accept-Language: en-US,en;q=0.8
 
         if clist=="home":
             content.extend([
-                #("Meklēt TV arhīvā", "ltc::search/{0}","","Meklēt TV arhīvā"), #TODO
-                ("Meklēt filmas", "ltc::viss/search/?cat=movies&q={0}","","Meklēt filmu sadaļa"),
-                ("Meklēt seriālus", "ltc::viss/search/?cat=series&q={0}","", "Meklēt seriālu sadaļā"),
                 ("TV tiešraides", "ltc::tiesraide","","TV tiešraides"),
                 ("TV arhīvs", "ltc::arhivs","","TV arhīvs atseviškiem kanāliem"),
-                ("Videonoma", "ltc::videonoma","","Filmas (arī Priemiere) un seriāli"),
+                ("Bērnu", "ltc::videonoma/bernu","","Videonomas bērnu filmas un seriāli"),
+                ("Filmas", "ltc::videonoma/filmas","","Videonomas filmas"),
+                ("Premiere filas", "ltc::videonoma/premiere","","Videonomas premiere filmas"),
+                ("Seriāli", "ltc::videonoma/series","","Videonomas seriāli"),
+                ("360 Play", "ltc::videonoma/360play","","Videonomas lattelecom saturs"),  # TODO
+                #("Videonoma", "ltc::videonoma","","Filmas (arī Priemiere) un seriāli"),
+                ("Meklēt filmas", "ltc::viss/search/?cat=movies&q={0}","","Meklēt filmu sadaļa"),
+                ("Meklēt seriālus", "ltc::viss/search/?cat=series&q={0}","", "Meklēt seriālu sadaļā"),
+                #("Meklēt TV arhīvā", "ltc::viss/search/?cat=archive&q={0}","", "Meklēt TV arhīvā"),
+                #("Meklēt TV arhīvā", "ltc::search/{0}","","Meklēt TV arhīvā"), #TODO
             ])
             return content
 
@@ -98,15 +109,21 @@ Accept-Language: en-US,en;q=0.8
         elif path == 'viss/search/': #TODO vod/search/{q}
             r = self.call2(data)
             if "cat=movies" in data:
-                result = re.findall('class="forward-link" href="/([^"]+)">(<div class="new-movie">Premiere</div>)*<img src="([^"]+)".+?class="categorie-one-title">([^<]+)<', r, re.MULTILINE)
+                result = re.findall(r'class="forward-link" href="/([^"]+)/">(<div class="new-movie">(\w+)</div>)*<img src="([^"]+)".+?class="categorie-one-title">([^<]+)</div><div class="categorie-one-subtitle">([^<]+)<', r, re.DOTALL)
+            elif "cat=series" in data:
+                result = re.findall(r'class="forward-link" href="/([^"]+)/">(<div class="new-movie">(\w+)</div>)*<img src="([^"]+)".+?class="categorie-one-title">([^<]+)</div><div class="categorie-one-subtitle">([^<]+)<', r, re.DOTALL)
             else:
-                result = re.findall('class="forward-link" href="/([^"]+)">(<div class="new-movie">Premiere</div>)*<img src="([^"]+)".+?class="categorie-one-title">([^<]+)<', r, re.MULTILINE)
+                result = re.findall(r'class="forward-link" href="/([^"]+)/">(<div class="new-movie">(\w+)</div>)*<img src="([^"]+)".+?class="categorie-one-title">([^<]+)</div><div class="categorie-one-subtitle">([^<]+)<', r, re.DOTALL)
             for item in result:
-                title = item[3]
-                if not item[1]:
-                    title = title + "[P]"
-                data2 = item[0][0:-1]
-                img = "https://www.shortcut.lv" + item[2]
+                title1 = item[4]
+                title2 = item[5]
+                title = "%s ~ %s" % (title1, title2)
+                if item[1]:
+                    title = title + "[J]" if item[2] == "Jaunums" else title + "[P]"
+                data2 = item[0]
+                if re.search("e\d+$", data2):
+                    data2 += "?series"
+                img = "https://www.shortcut.lv" + item[3]
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
@@ -275,7 +292,7 @@ Accept-Language: en-US,en;q=0.8
             return content
 
 
-        ### Videonoma galvenā
+        ### Videonoma galvenā (vecā, vairs nestrada filtri)
         elif data=="videonoma":
             content.extend([
                 ("Filmas - jaunākās", "ltc::videonoma?page=0&genre=all_movies&sorts=laiks&cnt=40&clear=true&filter={}","https://www.shortcut.lv/media/features/2013-12-17/aa3b_videonoma_dropdown_filmas.png","Jaunākās filmas"),
@@ -299,7 +316,7 @@ Accept-Language: en-US,en;q=0.8
             ])
             return content
 
-        ### Videonomas saraksti
+        ### Videonomas saraksti (vecie, vairs nestrādā filtri)
         elif path == "videonoma":
             url = "https://www.shortcut.lv/movies-snippet.json"+params
             r = self._http_request(url,headers=self.headers2)
@@ -329,6 +346,116 @@ Accept-Language: en-US,en;q=0.8
                 content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
             return content
 
+        ### Filmas galvenā ###
+        elif data == "videonoma/filmas":
+            content.extend([
+                ("Aktuālās", "ltc::viss/actual_films","","Nesen pievienotas filmas"),
+                ("Komēdijas", "ltc::viss/comedy","","Komēdijas"),
+                ("Detektīvi", "ltc::viss/crime","","Detektivi"),
+                ("Ģimenes", "ltc::viss/family","","Ģimenes filmas"),
+                ("Asa sižeta", "ltc::viss/action","","Asa sižeta filmas"),
+                ("Romantika", "ltc::viss/romance","","Romantiskās filmas"),
+                ("Piedzīvojumu", "ltc::viss/adventure","","Piedzivojumu filmas"),
+                ("Supervaroņi", "ltc::viss/superheros","","Supervaroņu filmas"),
+                ("Fantastika", "ltc::viss/scifi","","Fantastikas filmas"),
+                ("Dokumentalās", "ltc::viss/documentaries","","Dokumentalās filmas"),
+                ("Šausmu", "ltc::viss/horror","","Šausmu filmas"),
+                ("Retro", "ltc::viss/retro_films","","Retro filmas"),
+                ("Koncerti un karaoke", "ltc::viss/concerts_karaoke","","Koncerti un filmas"),
+            ])
+
+        ### Sērijas galvenā ###
+        elif data == "videonoma/series":
+            content.extend([
+                ("Aktuālie seriāli", "ltc::viss/actual_series?series","","Nesen pievienotie seriāli"),
+                ("Aktuālie šovi", "ltc::viss/actual_series?series","","Nesen pievienotie TV šovi"),
+                ("Populārākie seriāli", "ltc::viss/popular_series?series","","Populārākie seriāli"),
+                ("Dokumentalie seriāli", "ltc::viss/documentary?series","","Dokumentalie seriāli"),
+                ("Izklaides pārraides", "ltc::viss/entertainment?series","","Izklaides pārraides"),
+                ("Detektivseriāli", "ltc::viss/Crime_series?series","","Detektivseriāli"),
+                ("Dramas seriāli", "ltc::viss/drama_series?series","","Dramas seriāli"),
+                ("Par dabu", "ltc::viss/nature?series","","Seriāli par dabu"),
+                ("Gardēžiem", "ltc::viss/gourmets?series","","Seriāli gardēžiem"),
+                ("Mistērija", "ltc::viss/mystery_series?series","","Mistērijas seriāli"),
+                ("Oriģinālsaturs", "ltc::viss/originals_series?series","","Oriģinālsatura seriāli"),
+                ("Klasika", "ltc::viss/classic?series","","Klasika"),
+            ])
+
+        ### Bērnu galvenā ###
+        elif data == "videonoma/bernu":
+            content.extend([
+                ("Nesen pievienotais", "ltc::viss/actual_kid","","Nesen pievienotais bernu saturs"),
+                ("Bērnu Premiere", "ltc::viss/kids_premiere","","Bērnu Premiere saturs"),
+                ("Multfilmas", "ltc::viss/animation2","","Multfilmas"),
+                ("Bērnu seriāli", "ltc::viss/kids_series?series","","Bērnu seriāli"),
+                ("Ģimenes filmas", "ltc::viss/family","","Ģimenes filmas"),
+                ("Multfilmas latviski", "ltc::viss/animation_lv","","Multfilmas latviski"),
+                ("Retro multfilmas", "ltc::viss/retro_animation","","Retro multfilmas"),
+                ("Latviešu multfilmas", "ltc::viss/animation","","Latviešu multfilmas"),
+                ("Raidijumi berniem", "ltc::viss/kids_events","","Raidijumi berniem"),
+            ])
+
+        ### Filmas premiere galvenā ###
+        elif data == "videonoma/premiere":
+            content.extend([
+                ("Aktuālās Premiere filmas", "ltc::viss/actual_premiere","","Nesen pievienotās Premiere filmas"),
+                ("Tikko no kinoteātra", "ltc::viss/just_from_cinema","","Filmas tikko no kinoteātra"),
+                ("Bērnu Premiere", "ltc::viss/kids_premiere","","Bērnu Premiere saturs"),
+                ("Komēdijas Premiere", "ltc::viss/comedy_premiere","","Premiere komēdijas filmas"),
+                ("Detektivi Premiere", "ltc::viss/crime_premiere","","Premiere detektivfilmas"),
+                ("Piedzīvojumu Premiere", "ltc::viss/adventure_premiere","","Premiere piedzivojumu filmas"),
+                ("Fantastika Premiere", "ltc::viss/scifi_premiere","","Premiere fantastikas filmas"),
+                ("Šausmu Premiere", "ltc::viss/horror_premiere","","Premiere šausmu filmas"),
+            ])
+
+        ### 360 Play galvenā ###
+        elif data == "videonoma/360play":
+            content.extend([
+                ("Viss", "ltc::viss/bezmaksas?series","","Viss bezmaksas saturs"),
+                ("360TV", "ltc::viss/360_free?series","","360TV bezmaksas saturs"),
+                ("Red Bull", "ltc::viss/Red_bull?series","","Red Bull bezmaksas saturs"),
+            ])
+            r = self.call
+
+        ### Videonomas saraksti ###
+        elif plist[0] == "viss" or "load_more" in data:
+            #content.append(("Videonomas saraksts", "", "", ""))
+            if "viss" in data:
+                r = self.call2(data)
+                m = re.search('(<div class="container categorie">.+?)</div><div class="loader off">', r, re.DOTALL)
+                html = m.group(1) if m else ""
+            else:
+                url = self.api_url2 + path
+                params = data.split("?")[1]
+                r = self._http_request(url, params, headers=self.headers3 )
+                js = json.loads(r)
+                html = js["data"] if "data" in r else ""
+            result = re.findall("<div title=.+?</a>", html, re.DOTALL)
+            for it in result:
+                title1 = re.search('<div class="categorie-one-title">(.+?)<', it, re.DOTALL).group(1)
+                title2 = re.search('<div class="categorie-one-subtitle">(.+?)<', it, re.DOTALL).group(1)
+                title = "%s ~ %s" % (title1, title2)
+                img = self.api_url2 + re.search('img src="(.+?)"', it).group(1)
+                data2 = re.search('href="/(.+?)/"', it).group(1)
+                if "?series" in data or re.search("e\d+$", data2):
+                    data2 += "?series"
+                if "Jaunums" in it:
+                    title += " [J]"
+                if "Premiere" in it:
+                    title += " [P]"
+                desc = title
+                content.append((title,self.name+"::"+data2,img,desc))
+            if not "end-reached-box" in r:
+                if "load_more" in data:
+                    page = int(qs["pack"])
+                    data2 = re.sub("pack=\d+","pack=%s"%(page+1),data)
+                else:
+                    section = re.search('data-section="(\d+)"', r).group(1)
+                    data2 = "load_more.json?pack=1&section=%s" % section
+                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
+            return content
+
+
         ### Sērijas
         elif clist=="videonoma" and  (params=="?series" or "season_nr" in qs):
             url = "https://www.shortcut.lv/"+path
@@ -354,7 +481,7 @@ Accept-Language: en-US,en;q=0.8
                         img = img0
                         desc = title
                         content.append((title, self.name + "::" + data2, img, desc))
-                    return content
+                    #return content
 
                 else:  # Sezonas epizožu saraksts
                     if not "season_nr" in qs:
@@ -375,7 +502,7 @@ Accept-Language: en-US,en;q=0.8
                         img = "https://www.shortcut.lv"+item[1]
                         desc = title
                         content.append((title,self.name+"::"+data2,img,desc))
-                    return content
+                    #return content
 
             # Nav sezonu
             else:
@@ -386,10 +513,17 @@ Accept-Language: en-US,en;q=0.8
                     img = "https://www.shortcut.lv"+item[1]
                     desc = title
                     content.append((title,self.name+"::"+data2,img,desc))
-                return content
+                #return content
+                if not result:  # nav ne epizožu, atgriež pats sevi bez ?series
+                    title = desc = raidijums
+                    img = img0
+                    data2 = path
+                    content.append((title,self.name+"::"+data2,img,desc))
+            return content
+
 
         ### Videonomas video
-        elif clist=="videonoma" and len(data.split("/"))>1:
+        elif clist=="videonoma" and len(data.split("/"))> 2:
             ch = data.split("/")[1]
             video_id=data[data.find("/")+1:]
             #video_id=data.split("/")[-1]
@@ -411,8 +545,7 @@ Accept-Language: en-US,en;q=0.8
             content = (title,data2,"",desc)
             return content
 
-        else:
-            return content
+        return content
 
     def get_streams(self, data):
         print "[ltc] get_streams:", data
@@ -496,7 +629,7 @@ Accept-Language: en-US,en;q=0.8
             return True
         elif cmd[0]=="arhivs" and len(cmd)==4:
             return True
-        elif cmd[0]=="videonoma" and len(cmd)==3 and  not "?" in data:
+        elif cmd[0]=="videonoma" and len(cmd) >= 3 and  not "?" in data:
             return True
         else:
             return False