Salabots vēlreiz replay, custom headeri iekš run player

run.py

@@ -708,6 +708,13 @@ def player(url, title = "", subfile = "",headers={}, player="ffplay"):
         subfile = re.sub("\w:", "", subfile)
         vf = 'subtitles=%s,' % subfile + vf
     cmd3 = ["ffplay.exe",url, "-window_title", title, "-vf", vf]
+    if headers:
+        cmd3.append("-headers")
+        hd = []
+        for k in headers:
+            hd.append("%s:%s" % (k, headers[k]))
+        hd = "\n".join(hd)
+        cmd3.append(hd)
     if not player:
         cmd = cmd3 if url.startswith("https") else cmd2
     else:

sources/replay.py

@@ -171,19 +171,23 @@ class Source(SourceBase):
                 m = re.search('datePublished" datetime="([^"]+)"', item, re.DOTALL)
                 if m:
                     published = m.group(1)
-                    published = datetime.datetime.strptime(published,"%Y-%m-%dT%H:%M:%SZ")
-                    published = util.datetime_from_utc_to_local(published)
-                    published_datetime = datetime.datetime.strftime(published,"%d.%m.%Y %H:%M")
-                    published_date = datetime.datetime.strftime(published,"%d.%m.%Y")
-                    title = title + " (%s)" % published_date
-                    desc = desc + "\nPublished: %s" % published_datetime
+                    try:
+                        published = util.datetime_from_zulu_to_utc(published)
+                        published = util.datetime_from_utc_to_local(published)
+                        published_datetime = datetime.datetime.strftime(published,"%d.%m.%Y %H:%M")
+                        published_date = datetime.datetime.strftime(published,"%d.%m.%Y")
+                        title = title + " (%s)" % published_date
+                        desc = desc + "\nPublished: %s" % published_datetime
+                    except:
+                        a = 1
+                        pass
                 m = re.search('thumbnail__duration">([^<]+)<', item, re.DOTALL)
                 if m:
                     desc = desc + "\nDuration: %s" % m.group(1)
                 m = re.search(r'<a href="https://replay\.lsm\.lv/lv/raidijums/[^"]+">([^<]+)</a>', item, re.DOTALL)
                 if m:
                     desc = desc + "\nProgram: %s" % m.group(1)
-                m = re.search('<li class="">(Vēl[^<]+)</li>', item, re.DOTALL)
+                m = re.search('<li class=".*?">(Vēl[^<]+)</li>', item, re.DOTALL)
                 if m:
                     desc = desc + "\nRemaining: %s" % m.group(1)
                 content.append((title,self.name+"::"+data2,img,desc))
@@ -202,28 +206,29 @@ class Source(SourceBase):
 
             return content
 
-
-
+    #===========================================================================
     def get_streams(self, data):
         source, data, path, plist, clist, params, qs = self.parse_data(data)
-        lang = qs["lang"] if "lang" in qs else self.country
+        lang = "ru" if clist == 'statja' else "lv"
+        headers2 = {}
+        nfo = {}
 
         ### Kanāla tiesraide
-        # TODO - jāuztaisa get_streams/get_info
         if clist == "tiesraide" and "/" in data:
             r = self.call(data, lang=lang)
             ch = data.split('/')[1]
+
             veids = "audio" if "lr" in ch else "video"
-            #url = "https://replay.lsm.lv/lv/tiesraide/ltv7/"
             url = "https://replay.lsm.lv/lv/tiesraide/%s/"%ch
-            r= self._http_request(url)
+            r = self._http_request(url)
 
             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()
-            title = "%s - %s [%s]"%(ch.upper(), title,laiks)
+            dd = datetime.datetime.now().strftime("%d.%m.%Y")
+            title = "%s - %s (%s) [%s]"%(ch.upper(), title, dd, laiks)
             desc = title
 
             if veids == "video":
@@ -241,16 +246,21 @@ class Source(SourceBase):
                 m = re.search(r'iframe src=\\"([^"]+)\\', r)
                 if not m:
                     raise Exception("No stream found")
-                url = m.group(1).replace('\\/', "/")
+                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(url,headers=headers)
+                r = self._http_request(url2,headers=headers)
                 m = re.search('"([^"]+m3u8[^"]+)"', r)
                 if not m:
                     raise Exception("No stream found")
                 data2 = m.group(1).replace("\\","")
-                #r = self._http_request(data2, headers=headers)
+                headers2["Referer"] = url2
+                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]
+                #r = self._http_request(data2, headers=headers2)
+                a = 1
 
             else: # audio
                 lrn = ch.replace("lr","")
@@ -270,35 +280,74 @@ class Source(SourceBase):
             if not m:
                 raise Exception("No stream found")
             url2 = m.group(1).replace("&amp;", "&")
-            m = re.search('<h1 class="title">([^<]+)</h1>', r)
-            title = m.group(1).strip()
+            #m = re.search('<h1 class="title">([^<]+)</h1>', r)
+            m = re.search('<meta name="name" content="([^"]+)">', r)
+            title = m.group(1)
+            title = title.replace("- REplay.lv", "")
+            title = title.strip()
+            m = re.search('<meta content="([^"]+)" property="og:video:release_date"', r)
+            if m:
+                dd = m.group(1).split("T")[0].split("-")
+                title += " (%s.%s.%s)" % (dd[2], dd[1], dd[0])
             m = re.search('<meta content="([^"]+)" property="og:image">', r)
             img = m.group(1) if m else ""
             m = re.search('<div class="description">(.+?)</div>', r, re.DOTALL)
             if m:
-                desc = m.group(1)
+                plot = m.group(1)
                 rr = re.sub("<.+?>", " ", m.group(1))
                 rr = re.sub("[\t\n]", " ", rr)
-                desc =  re.sub(" {2,100}", " ", rr).strip()
+                plot =  re.sub(" {2,100}", " ", rr).strip()
             else:
-                desc = ""
+                plot = ""
+            desc = [title]
+            m = re.search(r'<figure><span class="channel-logo (\w+)"></span></figure>([^<]+)</a>', r, re.IGNORECASE)
+            if m:
+                desc.append("Programma: %s [%s]" % (m.group(2), m.group(1).upper()))
+            m = re.search('<ul class="media-info-list">(.+?)</ul>', r, re.DOTALL)
+            if m:
+                for m2 in re.finditer("<strong>([^<]+)</strong> *(<a[^<]+?>)*([^<]+)*<", m.group(1)):
+                    desc.append("%s %s" % (m2.group(1).strip(),m2.group(3).strip() if m2.group(3) else ""))
+                m2 = re.search('li class="[^"]*">(Pieejam.+)</li>', m.group(1))
+                if m2:
+                    desc.append(m2.group(1))
+            desc.append(plot)
+            desc = "\n".join(desc)
+
             headers = headers2dict("""
 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
 Referer: https://replay.lsm.lv/%s/%s
-Host: ltv.lsm.lv
             """% (lang, data))
             r2 = self._http_request(url2,headers=headers)
             m = re.search(r"<script>LTV.Video.players.create\('videoplay', ({.+?})\);</script>", r2, re.DOTALL)
             #m = re.search('"file":"([^"]+)', r2)
-            if not m:
-                raise Exception("No stream found")
-            js = json.loads(m.group(1))
-            if "playlist" in js["player"]:
-                data2 = js["player"]["playlist"][0]["sources"][0]["file"]
-            elif "file" in  js["player"]:
-                data2 = js["player"]["file"]
-            else:
-                raise Exception("No stram found")
+            if m:
+                js = json.loads(m.group(1))
+                if js["ext_video_id"]:
+                    data2 = "https://www.youtube.com/watch?v=" + js["ext_video_id"]
+                elif "playlist" in js["player"]:
+                    data2 = js["player"]["playlist"][0]["sources"][0]["file"]
+                elif "clip" in js["player"]:
+                    if len(js["player"]["clip"]["sources"]) > 0:
+                        data2 = js["player"]["clip"]["sources"][0]["src"]
+                    else:
+                        raise Exception("No streams found!")
+                elif "file" in  js["player"]:
+                    data2 = js["player"]["file"]
+                else:
+                    raise Exception("No stram found")
+            else:  # futbols u.c.
+                m = re.search('<div class="video-player">.+?<iframe src="([^"]+)', r2, re.DOTALL)
+                if not m:
+                    raise Exception("No stream found")
+                url3 = "https:" + m.group(1)
+                headers["Referer"] = url2
+                r3 = self._http_request(url3, headers=headers)
+                m = re.search(r"src: '([^']+)',\s+?type: 'application/x-mpegurl'", r3, re.DOTALL)
+                if not m:
+                    raise Exception("No stream found")
+                data2 = "https:" + m.group(1)
+
+
             if "youtube" in data2:
                 video_id = re.search(r"/watch\?v=([^&]+)",data2).group(1)
                 data2 = YouTubeVideoUrl().extract(video_id)
@@ -311,6 +360,9 @@ Host: ltv.lsm.lv
         stream["img"] = img
         stream["desc"] = desc
         stream["resolver"] = "replay"
+        stream["headers"] = headers2
+        stream["nfo"] = nfo
+        #stream["filename"] = filename # TODO jāģenere jēdzigs faila nosaukums, kuru pēc tam izmanto downloadsb
         return [stream]
 
     def is_video(self,data):

util.py

@@ -673,30 +673,38 @@ def datetime_from_utc_to_local(utc_datetime):
     offset = datetime.datetime.fromtimestamp(now_timestamp) - datetime.datetime.utcfromtimestamp(now_timestamp)
     return utc_datetime + offset
 
+def datetime_from_zulu_to_utc(data):
+    d = map(int, data.split("T")[0].split("-"))
+    h = map(int, data.split("T")[1][:-1].split(":"))
+    dt = datetime.datetime(d[0], d[1], d[2], h[0], h[1], h[2])
+    return dt
+
 #def parse_html(url):
 #    return BeautifulSoup(request(url), 'html5lib', from_encoding='utf-8')
 
 if __name__ == "__main__":
+
+    datetime_from_zulu_to_utc('2018-06-24T06:10:00Z')
     s = open("The LEGO Ninjago Movie (2017).lv.vtt").read()
-    s2 = vtt2srt(s)
-    open("The LEGO Ninjago Movie (2017).lv.srt", "w").write(s2)
+    #s2 = vtt2srt(s)
+    #open("The LEGO Ninjago Movie (2017).lv.srt", "w").write(s2)
 
-    s = 'B\xc4\x93thovena D\xc4\x81rgumu Taka (2014)/Beethoven's Treasure [LV]'
+    #s = 'B\xc4\x93thovena D\xc4\x81rgumu Taka (2014)/Beethoven's Treasure [LV]'
     #s = s.decode("utf8")
     #s=unescape(s)
     #url = "http://localhost:88/https://walterebert.com/playground/video/hls/ts/480x270.m3u8?token=xxxx~User-Agent=Enigma2~Cookie=xxxxx"
-    url = "http://hyt4d6.vkcache.com/secip/0/UMQ3q2gNjTlOPnEVm3iTiA/ODAuMjMyLjI0MC42/1479610800/hls-vod-s3/flv/api/files/videos/2015/09/11/144197748923a22.mp4.m3u8http://hyt4d6.vkcache.com/secip/0/Y-ZA1qRm8toplc0dN_L6_w/ODAuMjMyLjI0MC42/1479654000/hls-vod-s3/flv/api/files/videos/2015/09/11/144197748923a22.mp4.m3u8"
-    headers = {"User-Agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/47.0.2526.70 Mobile/13C71 Safari/601.1.46"}
-    url = "http://str1e.lattelecom.tv/mobile-vod/mp4:sf_fantastic_beasts_and_where_to_find_them_en_hd.mp4/playlist.m3u8?resource_id=fantastic_beasts_and_where_to_find_them&auth_token=6NAvMFDG+rYTAc4hb5JeL2bmsaRR7bAE23M6KDmhKYOGyXoo0gDpJUE9scYy+nQmfbgk03cWMe9MuXWSH1GqwolEk2jOQ/8Mrg7tOdbwrA8zM7nmkfCZPqQkwajZN4mfSJQVKHqXqJ8="
-    headers={}
-    print url
-    url = "replay::tiesraide/ltv1/"
-    url = "ltc::content/live-streams/103?include=quality"
-    urlp = streamproxy_encode2(url,headers)
-    print urlp
-    url2,headers2 = streamproxy_decode2(urlp)
-    print url2
-    player(urlp)
+    #url = "http://hyt4d6.vkcache.com/secip/0/UMQ3q2gNjTlOPnEVm3iTiA/ODAuMjMyLjI0MC42/1479610800/hls-vod-s3/flv/api/files/videos/2015/09/11/144197748923a22.mp4.m3u8http://hyt4d6.vkcache.com/secip/0/Y-ZA1qRm8toplc0dN_L6_w/ODAuMjMyLjI0MC42/1479654000/hls-vod-s3/flv/api/files/videos/2015/09/11/144197748923a22.mp4.m3u8"
+    #headers = {"User-Agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/47.0.2526.70 Mobile/13C71 Safari/601.1.46"}
+    #url = "http://str1e.lattelecom.tv/mobile-vod/mp4:sf_fantastic_beasts_and_where_to_find_them_en_hd.mp4/playlist.m3u8?resource_id=fantastic_beasts_and_where_to_find_them&auth_token=6NAvMFDG+rYTAc4hb5JeL2bmsaRR7bAE23M6KDmhKYOGyXoo0gDpJUE9scYy+nQmfbgk03cWMe9MuXWSH1GqwolEk2jOQ/8Mrg7tOdbwrA8zM7nmkfCZPqQkwajZN4mfSJQVKHqXqJ8="
+    #headers={}
+    #print url
+    #url = "replay::tiesraide/ltv1/"
+    #url = "ltc::content/live-streams/103?include=quality"
+    #urlp = streamproxy_encode2(url,headers)
+    #print urlp
+    #url2,headers2 = streamproxy_decode2(urlp)
+    #print url2
+    #player(urlp)
     pass