piconas apakšfolderī

run (pikonas, tmp)
filmix search
viaplay search/sort

resolvers/cloudsany.py

@@ -41,7 +41,7 @@ def resolve(url):
     m = re.search('cloudsany\.\w+/i/(\w+)', url)
     if not m:
         return stream
-    vid=m.group(1)
+    vid = str(m.group(1))
 
     r = requests.get(url, headers=headers)
     if r.status_code <> 200:
@@ -57,26 +57,36 @@ def resolve(url):
 
 
     # Subtitles #
-    sub = {}
+    subs = []
+    # https://cloudsany.com/subtitles/0w3y7su4c2ko.srt
+    # Latvian|label|srt|subtitles
+    #url_sub = "https://cloudsany.com/subtitles/%s.%s" % (vid, "srt")
+    url_sub = "https://cloudsany.com/subtitles/%s.srt" % vid
+    r2 = requests.head(url_sub)
     m = re.search(r"(\w+)\|label\|(\w+)\|(\w+)\|subtitles", p0)
-    if m:
-        url_sub = "https://cloudsany.com/subtitles/%s.%s" % (m.group(3), m.group(2))
+    if r2.status_code == 200 and m:
+        sub = {}
+        #url_sub = "https://cloudsany.com/subtitles/%s.%s" % (vid, "srt")
         url_title = m.group(1)
         print url_title
         sub["url"] = url_sub
         sub["lang"] = m.group(1)
         sub["name"] = m.group(1)
-        sub["type"] = "srt"
+        sub["type"] = m.group(2)
+        subs = [sub]
 
     # Stream URL
-    m = re.search(r"tracks\|(\w+)\|(\w+)\|(\w+)\|files\|(\w+)\|(\w+)\|(\w+)", p0)
-    if not m:
+    # co|sanii|dl1|file
+    m1 = re.search("\|(co)\|(\w+)\|(\w+)\|", p0)
+    # tracks|mp4|video|ut4dluxu56tyll|files
+    m2 = re.search(r"tracks\|(\w+)\|(\w+)\|(\w+)\|files", p0)
+    # 0://c.b.a/1t/6/1s/1r.1q
+    m3 = re.search(r"0://\w+\.\w+\.\w+/\w+/(\d+)/", r)
+    if not (m1 and m2 and m3):
         raise Exception("Can not find stream url")
-    #https://dl4.sanii.co/files/8/80mbh8zjyuh61n/video.mp4
-    # 0://1v.1u.1t/1s/2/1r/1q.1p
-    num = re.search(r"0://1\w\.1\w\.1\w/1\w/(\d+)", r).group(1)
+    # https://dl1.sanii.co/files/6/ut4dluxu56tyll/video.mp4
     url = "https://%s.%s.%s/files/%s/%s/%s.%s" % (
-        m.group(6), m.group(5), m.group(4), num, m.group(3), m.group(2), m.group(1))
+        m1.group(3), m1.group(2), m1.group(1), m3.group(1), m2.group(3), m2.group(2), m2.group(1))
     print url
 
     s = util.item()
@@ -84,7 +94,7 @@ def resolve(url):
     s["type"] = util.stream_type(s["url"])
     s["resolver"] = __name__
     #s["lang"] = lang
-    s["subs"] = [sub]
+    s["subs"] = subs
     s["name"] = url
     return [s]
 

run.py

@@ -11,7 +11,7 @@ import tkSimpleDialog as tkd
 
 import PIL, StringIO
 from PIL import ImageTk, Image
-import requests, urllib2
+import requests, urllib2, tempfile
 
 from ContentSources import ContentSources
 from sources.SourceBase import stream_type
@@ -36,8 +36,9 @@ class Main(Frame):
             self.sources = sources
         else:
             self.sources = ContentSources("sources", cfg_file)
-        self.picons_path = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "picons")
-        self.tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "tmp")
+        self.picons_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "picons")
+        #self.tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "tmp")
+        self.tmp_path = os.path.join(tempfile.gettempdir(), "playstream")
         if not os.path.exists(self.tmp_path):
             os.mkdir(self.tmp_path)
         self.history = []
@@ -125,7 +126,7 @@ class Main(Frame):
             if not self.sources.is_video(data):
                 if "{0}" in data:
                     a = tkd.askstring("Search", "Search for")
-                    cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])
+                    cur2 = (cur2[0],cur2[1].format(a.encode("utf8")),cur2[2],cur2[3])
                 self.history.append((self.cur, cs))
                 self.cur = self.content[cs]
                 self.cur_index = 0
@@ -466,6 +467,7 @@ class VideoInfo(tkd.Dialog):
             self.listbox2.pack(side=LEFT, fill=BOTH, expand=1)
             scrollbar3.pack(side=LEFT, fill=Y)
             for i,s in enumerate(self.subs):
+                if not len(s):continue
                 item = ("%s - %s"%(s["lang"],s["name"])).encode("utf8")
                 self.listbox2.insert(END, item)
             #self.listbox2.bind('<Double-1> ', self.list_select)

sources/filmix.py

@@ -73,15 +73,19 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             if len(plist) < 2:
                 return content
             import requests
-            ses = requests.session()
-            r = ses.get(self.url+data)
+            #ses = requests.session()
+            r = requests.get(self.url+data)
+            cookie = r.cookies["FILMIXNET"]
             url = "https://filmix.me/engine/ajax/sphinx_search.php"
             headers = headers2dict("""
-                User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:55.0) Gecko/20100101 Firefox/55.0
-                Content-Type: application/x-www-form-urlencoded; charset=UTF-8
-            """)
-            data = "scf=fx&story=%s&search_start=0&do=search&subaction=search" % (plist[1].replace(" ", "+"))
-            r = ses.post(url, data, headers=headers)
+User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:58.0) Gecko/20100101 Firefox/58.0
+X-Requested-With: XMLHttpRequest
+Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+Cookie: FILMIXNET=%s
+"""% cookie)
+            #data = "scf=fx&story=%s&search_start=0&do=search&subaction=search" % (plist[1].replace(" ", "+"))
+            data = "sdc=fx&story=%s&do=search&subaction=search"% (plist[1].replace(" ", "+"))
+            r = requests.post(url, data, headers=headers)
             #r = r.content.decode("cp1251").encode("utf8")
             content = self.process_list(r.content, content)
             return content

sources/ltc.py

@@ -81,11 +81,12 @@ Accept-Language: en-US,en;q=0.8
 
         if clist=="home":
             content.extend([
-                ("Search TV", "ltc::search/{0}","","Search in TV archive"),
-                ("Search Video", "ltc::viss/search/?cat=movies&q={0}","","Search in video"),
-                ("Live streams", "ltc::tiesraide","","TV live streams"),
-                ("Archive", "ltc::arhivs","","TV live archive"),
-                ("Video", "ltc::videonoma","","Video on demand"),
+                #("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ļā"),
+                ("Meklēt seriālus", "ltc::viss/search/?cat=series&q={0}","","Meklēt seriālu sadaļā"),
+                ("TV tiešraides", "ltc::tiesraide","","TV tiesraides"),
+                ("TV arhīvs", "ltc::arhivs","","TV arhīvs atseviškiem kanāliem"),
+                ("Videonoma", "ltc::videonoma","","Filmas (ari Priemiere) un seriāli"),
             ])
             return content
 
@@ -99,17 +100,17 @@ Accept-Language: en-US,en;q=0.8
             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)
-                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]
-                    desc = title
-                    content.append((title,self.name+"::"+data2,img,desc))
-                return content
             else:
-                return content
+                result = re.findall('class="forward-link" href="/([^"]+)">(<div class="new-movie">Premiere</div>)*<img src="([^"]+)".+?class="categorie-one-title">([^<]+)<', r, re.MULTILINE)
+            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]
+                desc = title
+                content.append((title,self.name+"::"+data2,img,desc))
+            return content
 
         ### Tiešraides kanānālu saraksts ###
         elif data=="tiesraide":

sources/mtgplay.py

@@ -67,12 +67,12 @@ class Source(SourceBase):
 
         if clist=="home":
             content.extend([
-                #("Search", "mtgplay::meklet?country=%s&term={0}"%self.country,"","Search videos"), ### TODO
+                ("Search", "mtgplay::search?country=%s&term={0}"%self.country,"","Search videos"), ### TODO
                 ("TV Live", "mtgplay::videos?country=%s&order=title&type=live"%self.country,"","TV live streams(not always available)"),
                 ("Last videos", "mtgplay::videos?country=%s&order=-airdate"%self.country,"","Last aired videos"),
                 ("Categories", "mtgplay::categories?country=%s&order=name"%self.country,"","Categories"),
                 ("Channels", "mtgplay::channels?country=%s&order=id"%self.country,"","TV channels"),
-                ("Programs by name", "mtgplay::formats?country=%s&order=-title"%self.country,"","Programs by name"),
+                ("Programs by name", "mtgplay::formats?country=%s&order=title"%self.country,"","Programs by name"),
                 ("Programs by popularity", "mtgplay::formats?country=%s&order=-popularity"%self.country,"","Programs by popularity")
             ])
             return content
@@ -88,6 +88,8 @@ class Source(SourceBase):
                 content.append(("Previous page", self.name+"::"+data2.encode("utf8"),"", "Goto previous page"))
 
             if "_embedded" in r:
+                if clist == "search":
+                    clist = "formats"
                 for item in r["_embedded"][clist]:
                     if "title" in item:
                         title = item["title"]
@@ -144,11 +146,12 @@ class Source(SourceBase):
                         #if "country" in qs: data2 += "&country="+qs["country"]
                         #if "category" in qs: data2 += "&category="+qs["category"]
                         #if "channel" in qs: data2 += "&channel="+qs["channel"]
-                        data2 += "&order=title"
-                        air_at = item["latest_video"]["publish_at"] if "publish_at" in item["latest_video"] else ""
-                        air_at = air_at[0:16].replace("T"," ") if air_at else ""
-                        if air_at:
-                            desc = "Last video: %s\n"%air_at + desc
+                        data2 += "&order=-id"
+                        if "lastest_video" in item:
+                            air_at = item["latest_video"]["publish_at"] if "publish_at" in item["latest_video"] else ""
+                            air_at = air_at[0:16].replace("T"," ") if air_at else ""
+                            if air_at:
+                                desc = "Last video: %s\n"%air_at + desc
 
                     ### Seasons ###
                     elif clist == "seasons":
@@ -157,7 +160,7 @@ class Source(SourceBase):
                         #if "country" in qs: data2 += "&country="+qs["country"]
                         #if "category" in qs: data2 += "&category="+qs["category"]
                         #if "channel" in qs: data2 += "&channel="+qs["channel"]
-                        data2 += "&order=title"
+                        data2 += "&order=-id"
 
                         summary = item["summary"] if "summary" in item and item["summary"] else ""
                         try: