ltv.lsm.lv strīmi

salaboti title ltc,filmix

sources/filmix.py

@@ -202,7 +202,7 @@ Cookie: FILMIXNET=%s;
             title = re.search('itemprop="name" content="([^"]+)"', r2, re.DOTALL).group(1)
             m = re.search('itemprop="alternativeHeadline" content="([^"]+)"', r2, re.DOTALL)
             if m:
-                title = title + "/"+m.group(1)
+                title = title + " ~ "+m.group(1)
             m = re.search(r'img src="(https://filmix\.co/uploads/posters/thumbs/[^"]+)"', r2)
             img = m.group(1) if m else self.img
 

sources/ltc.py

@@ -117,7 +117,8 @@ X-Requested-With: XMLHttpRequest
             for item in result:
                 title1 = item[4]
                 title2 = item[5]
-                title = "%s ~ %s" % (title1, title2)
+                if title1 <> title2:
+                    title = "%s ~ %s" % (title1, title2)
                 if item[1]:
                     title = title + "[J]" if item[2] == "Jaunums" else title + "[P]"
                 data2 = item[0]
@@ -434,7 +435,10 @@ X-Requested-With: XMLHttpRequest
             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)
+                if title1 <> title2:
+                    title = "%s ~ %s" % (title1, title2)
+                else:
+                    title = title1
                 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):
@@ -476,7 +480,10 @@ X-Requested-With: XMLHttpRequest
                 set2 = title2.replace("\xe2\x80\x93", "-")
                 if " - " in set2:
                     set2 = set2.split(" - ")[0]
-                raidijums = "%s ~ %s" % (set1, set2)
+                if set1 <> set2:
+                    raidijums = "%s ~ %s" % (set1, set2)
+                else:
+                    raidijums = set1
             else:
                 m = re.search('<div class="movie_titles"><div class="en">([^<]+)</div>', r)
                 raidijums = m.group(1) if m else "Series"
@@ -935,9 +942,10 @@ Host: manstv.lattelecom.tv
             m = re.search('<meta name="dr:say:title" content="([^"]+)">', r, re.IGNORECASE)
             title1 = title2 = unescape(m.group(1)) if m else "Video"
         nfo["title"] = title1
-        nfo["originaltitle"] = title2
-        if nfo["originaltitle"] and not nfo["title"]:
-            nfo["title"] = nfo["originaltitle"]
+        if not title1 == title2:
+            nfo["originaltitle"] = title2
+            if nfo["originaltitle"] and not nfo["title"]:
+                nfo["title"] = nfo["originaltitle"]
         if 'episode_switcher_title' in r:
             set1 = title1.replace("\xe2\x80\x93", "-")
             if " - " in set1:
@@ -945,7 +953,8 @@ Host: manstv.lattelecom.tv
             set2 = title2.replace("\xe2\x80\x93", "-")
             if " - " in set2:
                 set2 = set2.split(" - ")[0]
-            nfo["set"] = "%s ~ %s" % (set1, set2)
+            if set1 <> set2:
+                nfo["set"] = "%s ~ %s" % (set1, set2)
             m = re.search(r"<br>(S(\d+)E(\d+))<", r, re.IGNORECASE | re.DOTALL)
             if m:
                 #nfo["title"] = nfo["title"] + " (%s)" % m.group(1)

sources/replay.py

@@ -126,6 +126,17 @@ class Source(SourceBase):
                 desc = desc + " [%s]" % item[3]
                 title = title + " - " + desc
                 content.append((title,self.name+"::"+data2,img,desc))
+
+            url = "https://ltv.lsm.lv/lv/tieshraide/"
+            r = self._http_request(url)
+            result = re.findall('<article class="entry highlight"><figure><a href="/lv/([^"]+)"><img src="([^"]+)".+?>([^<]+)</a>', r, re.IGNORECASE | re.DOTALL | re.MULTILINE)
+            for item in result:
+                data2 = item[0]
+                ch = data2.split("/")[1]
+                title = item[2] + " (ltv.lsm.lv)"
+                img = "https://ltv.lsm.lv/" + item[1]
+                desc = title
+                content.append((title,self.name+"::"+data2,img,desc))
             return content
 
         ### Meklēsana ###
@@ -214,48 +225,57 @@ class Source(SourceBase):
         nfo = {}
 
         ### Kanāla tiesraide
-        if clist == "tiesraide" and "/" in data:
-            r = self.call(data, lang=lang)
+        if clist == "tiesraide" and "/" in data or clist == "tieshraide":
+            if clist == "tiesraide":
+                url = "https://replay.lsm.lv/lv/" + data
+                #r = self.call(data, lang=lang)
+            else:
+                url = "https://ltv.lsm.lv/lv/" + data
+            r = self._http_request(url)
             ch = data.split('/')[1]
-
             veids = "audio" if "lr" in ch else "video"
-            url = "https://replay.lsm.lv/lv/tiesraide/%s/"%ch
-            r = self._http_request(url)
+            img = ch + ".png"
 
             m = re.search('span class="badge badge-primary">Tagad</span>([^<]+)<.+?<time>([^<]+)</time>', r, re.DOTALL)
-            tagad = m.group(1).strip() if m else ""
-            laiks = m.group(2).strip() if m else ""
-            laiks = h.unescape(laiks).encode("utf8")
-            title = m.group(1).strip() if m else path.split("/")[1].upper()
-            dd = datetime.datetime.now().strftime("%d.%m.%Y")
-            title = "%s - %s (%s) [%s]"%(ch.upper(), title, dd, laiks)
-            desc = title
+            if clist == "tieshraide":
+                m = re.search("<h1>([^<]+)</h1>", r)
+                title = m.group(1).strip() if m else ch.upper()
+                desc = title
+            else:
+                tagad = m.group(1).strip() if m else ""
+                laiks = m.group(2).strip() if m else ""
+                laiks = h.unescape(laiks).encode("utf8")
+                title = m.group(1).strip() if m else path.split("/")[1].upper()
+                dd = datetime.datetime.now().strftime("%d.%m.%Y")
+                title = "%s - %s (%s) [%s]"%(ch.upper(), title, dd, laiks)
+                desc = title
 
             if veids == "video":
                 m = re.search('<iframe.+?src="([^"]+)"', r)
                 if not m:
                     raise Exception("No stream found")
-                url = m.group(1)
                 headers = headers2dict("""
-            User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
-            Referer: https://replay.lsm.lv/lv/ieraksts/ltv/70398/tiesa-runa.-lielbritanija-gatavojas-referendumam-par-tu/
-                    """)
+            User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:62.0) Gecko/20100101 Firefox/62.0
+            Referer: %s
+                    """% url)
+                url = m.group(1)
                 r = self._http_request(url,headers=headers)
 
                 #m = re.search('<div class="video-player"><iframe.+src="([^"]+)"', r)
                 m = re.search(r'iframe src=\\"([^"]+)\\', r)
-                if not m:
-                    raise Exception("No stream found")
-                url2 = m.group(1).replace('\\/', "/")
-                m = re.search('poster":"([^"]+)"', r, re.DOTALL)
-                img =  "https://ltv.lsm.lv" + m.group(1).replace("\\","") if m else ch + '.png'
-
-                r = self._http_request(url2,headers=headers)
+                if m:
+                    #raise Exception("No stream found")
+                    headers["Referer"] = url
+                    url2 = m.group(1).replace('\\/', "/")
+                    m = re.search('poster":"([^"]+)"', r, re.DOTALL)
+                    img =  "https://ltv.lsm.lv" + m.group(1).replace("\\","") if m else ch + '.png'
+                    r = self._http_request(url2,headers=headers)
+                    url = url2
                 m = re.search('"([^"]+m3u8[^"]+)"', r)
                 if not m:
                     raise Exception("No stream found")
                 data2 = m.group(1).replace("\\","")
-                headers2["Referer"] = url2
+                headers2["Referer"] = url
                 headers2["User-Agent"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36"
                 headers2["Origin"] = "https://embed.lsm.lv"
                 headers2["Host"] = data2.split("/")[2]
@@ -373,6 +393,8 @@ Referer: https://replay.lsm.lv/%s/%s
             return True
         elif cmd[0]=="tiesraide" and len(cmd)>1:
             return True
+        elif cmd[0] == "tieshraide":
+            return True
         else:
             return False