0.7e

sources/SourceBase.py

@@ -8,7 +8,7 @@
 
 import urllib2, urllib
 import datetime, re, sys,os
-import requests
+import requests, json
 import ssl
 if "_create_unverified_context" in dir(ssl):
     ssl._create_default_https_context = ssl._create_unverified_context
@@ -83,8 +83,13 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
             return None
         config = ConfigParser.ConfigParser()
         if os.path.exists(self.config_file):
+            options0 = self.options
             config.read(self.config_file)
             self.options = OrderedDict(config.items(self.name))
+            for k in options0:
+                if not k in self.options:
+                    self.options[k] = options0[k]
+                    self.options_write(self.options)
         else:
             self.options_write(self.options)
         return self.options
@@ -105,9 +110,9 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
         return result
 
     def call_json(self, data,params=None,headers=None,lang=""):
-        result = self.call(url,params,headers=headers)
+        result = self.call(data,params,headers)
         if result:
-            result = json.loads(content)
+            result = json.loads(result)
             return result
         else:
             raise "No data returned"
@@ -143,7 +148,7 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
         plist = path.split("/")
         clist = plist[0]
         params = data[data.find("?"):] if "?" in data else ""
-        qs = dict(map(lambda x:x.split("="),re.findall("\w+=\w+",params)))
+        qs = dict(map(lambda x:x.split("="),re.findall("\w+=[\w\-]+",params)))
         return source,data,path,plist,clist,params,qs
 
 def stream_type(data):

sources/cinemalive.py

@@ -31,6 +31,7 @@ h = HTMLParser.HTMLParser()
 class Source(SourceBase):
 
     def __init__(self,country="",cfg_path=None):
+        self.hidden = True # nerāda menu nestrādājošos avotus
         self.name = "cinemalive"
         self.title = "cinemalive.tv"
         self.img = "picons/cinemalive.png" #"https://cinemalive.tv/assets/img/logo.png"

sources/euronews.py

@@ -104,8 +104,8 @@ Connection: keep-alive
                 if plist[1] in ("getTimeline"):
                     article = item["article"]
                     atype = item["type"]
-                    #if item["type"] == "wire":
-                        #continue # TODO
+                    if item["type"] == "wire":
+                        continue # TODO
                 else:
                     article = item
                     atype = "article"
@@ -161,7 +161,7 @@ Connection: keep-alive
         streams = []
 
         if path == "live":
-            url = "http://www.euronews.com/api/watchlive.json"
+            url = "http://www.euronews.com/api/watchlive.json" if lang == "en" else "http://%s.euronews.com/api/watchlive.json" % lang
             r = self._http_request(url)
             try:
                 js = json.loads(r)
@@ -176,17 +176,14 @@ Connection: keep-alive
             except:
                 raise Exception("No live stream found")
 
-            slist = js["primary"]
-
-            for l in slist:
-                stream = util.item()
-                stream["url"]=slist[l]["hls"]
-                stream["lang"]=l
-                stream["quality"]="variant"
-                stream["name"]="Euronews live [%s]"%l
-                stream["desc"]=stream["name"]
-                stream["type"]="hls" #stream_type(url)
-                streams.append(stream)
+            stream = util.item()
+            stream["url"]=js["primary"]
+            stream["lang"]= lang
+            stream["quality"]="variant"
+            stream["name"]="Euronews live [%s]"%lang
+            stream["desc"]=stream["name"]
+            stream["type"]="hls" #stream_type(url)
+            streams.append(stream)
 
         elif clist=="content" and plist[1] == "getArticle":
             if "lang" in qs:
@@ -199,8 +196,9 @@ Connection: keep-alive
                 if not r:
                     raise Exception("No live stream found")
                 if not "articlelist" in r:
-                    msg = r["label"] if "label" in r else "No article finde"
-                    raise Exception(msg)
+                    msg = r["label"] if "label" in r else "No article find"
+                    continue
+                    #raise Exception(msg)
                 article = r["articlelist"]
                 stream = util.item()
                 stream["url"]=article["videoUri"] if "videoUri" in article else ""
@@ -228,7 +226,22 @@ Connection: keep-alive
             s["order"] = lv+qv
         streams = sorted(streams,key=lambda item: item["order"],reverse=True)
         return streams
+
     def get_languages(self):
+        if self.languages: return self.languages
+        url = "http://www.euronews.com/"
+        r = self._http_request(url)
+        result = re.findall(r'<option value="([^"]+)"\s*(selected)*\slang="([^"]+)" hreflang="([^"]+)">', r, re.DOTALL)
+        languages = []
+        for item in result:
+            languages.append(item[3])
+        if not languages:
+            raise Exception("Can not get languages list")
+        self.languages = languages
+        return self.languages
+
+
+    def get_languages0(self):
         if self.languages: return self.languages
         url = "http://www.euronews.com/api/watchlive.json"
         r = self._http_request(url)

sources/filmix.py

@@ -111,7 +111,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             m = re.search(r"meta_key = \['(\w+)', '(\w+)', '(\w+)'\]", r, re.IGNORECASE)
             key = m.group(3) if m else ""
             js = self.get_movie_info(vid,key)
-            translations = js["message"]["translations"]["flash"]
+            translations = js["message"]["translations"]["html5"]
             for pl  in translations:
                 if translations[pl].startswith("http"):
                     continue
@@ -122,10 +122,11 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 raise Exception("No episodes list found!")
             #pl_link = js["message"]["translations"]["flash"].values()[0]
             #  TODO process several players, currently taking the first
+            #TODO - kļuda, vairs nesradā
             if not pl_link.startswith("http"):
-                pl_link = self.decode_uppod_text(pl_link)
+                pl_link = self.decode_direct_media_url(pl_link)
             js = self._http_request(pl_link)
-            js = self.decode_uppod_text(js)
+            js = self.decode_direct_media_url(js)
             js = json.loads(js)
             if "s" in qs:
                 s = int(qs["s"])
@@ -154,7 +155,10 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             r = self.call(data)
             r = r.decode("cp1251").encode("utf8")
             for r2 in re.findall('<article class="shortstory line".+?</article>', r, re.DOTALL):
-                m = re.search(r'<a href="https://filmix\.me/play/(\d+)" class="watch icon-play">', r2, re.DOTALL)
+                #m2 = re.search(r'<a class="watch icon-play" itemprop="url" href="([^"]+)"', r2, re.DOTALL)
+                #<a class="watch icon-play" itemprop="url" href="https://filmix.me/dramy/110957-stolik-19-2017.html"
+                #m = re.search(r'<a href="https://filmix\.me/play/(\d+)" class="watch icon-play">', r2, re.DOTALL)
+                m = re.search(r'<a class="watch icon-play" itemprop="url" href="https://filmix.me/\w+/(\d+)-', r2, re.DOTALL)
                 if not m: continue
                 vid = m.group(1)
                 data2 = "play/%s"%vid
@@ -202,15 +206,13 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         elif clist=="play" and not params:
             r = self.call(path)
             #r = r.decode("cp1251").encode("utf8")
-            m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
-            if not m:
-                raise Exception("Can not find video link")
-                #return False
-            video_link = m.group(1)
-            if video_link=='{video-link}':
-                return False
-            else:
+            #m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
+            #if not m:
+            if u"Фильм <a href=" in r.decode("cp1251"):
                 return True
+            else:
+                return False
+
         else:
             return False
 
@@ -235,12 +237,12 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             raise Exception("Can not find video link")
             #return []
         video_link = m.group(1)
-        series = True if video_link == '{video-link}' else False
+        series = False if u"Фильм <a href=" in r.decode("utf8") else True
         vid = plist[1]
         m = re.search(r"meta_key = \['(\w+)', '(\w+)', '(\w+)'\]", r, re.IGNORECASE)
         key = m.group(3) if m else ""
         js = self.get_movie_info(vid,key)
-        translations = js["message"]["translations"]["flash"]
+        translations = js["message"]["translations"]["html5"]
         for pl in translations:
             if translations[pl].startswith("http"):
                 continue
@@ -250,7 +252,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         else:
             raise Exception("No episodes list found!")
         if not pl_link.startswith("http"):
-            pl_link = self.decode_uppod_text(pl_link)
+            pl_link = self.decode_direct_media_url(pl_link)
 
         if not series : # Filma
             url0 = pl_link
@@ -268,7 +270,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         else: # Seriāls
             #pl_link = video_link
             js = self._http_request(pl_link)
-            js = self.decode_uppod_text(js)
+            js = self.decode_direct_media_url(js)
             js = json.loads(js)
             if "e" in qs:
                 if "s" in qs:
@@ -319,6 +321,43 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         js = json.loads(r)
         return js
 
+    def decode_base64(self, encoded_url):
+        codec_a = ("l", "u", "T", "D", "Q", "H", "0", "3", "G", "1", "f", "M", "p", "U", "a", "I", "6", "k", "d", "s", "b", "W", "5", "e", "y", "=")
+        codec_b = ("w", "g", "i", "Z", "c", "R", "z", "v", "x", "n", "N", "2", "8", "J", "X", "t", "9", "V", "7", "4", "B", "m", "Y", "o", "L", "h")
+        i = 0
+        for a in codec_a:
+            b = codec_b[i]
+            i += 1
+            encoded_url = encoded_url.replace(a, '___')
+            encoded_url = encoded_url.replace(b, a)
+            encoded_url = encoded_url.replace('___', b)
+        return base64.b64decode(encoded_url)
+
+    def decode_unicode(self, encoded_url):
+        from itertools import izip_longest
+        def grouper(n, iterable, fillvalue=None):
+            "grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx"
+            args = [iter(iterable)] * n
+            return izip_longest(fillvalue=fillvalue, *args)
+
+        _ = (encoded_url[1:] if encoded_url.find('#') != -1 else encoded_url)
+        tokens = map(lambda items: '\u0'+''.join(items), grouper(3, _))
+        return ''.join(tokens).decode('unicode_escape')
+
+    def decode_direct_media_url(self, encoded_url, checkhttp=False):
+        if(checkhttp == True and (encoded_url.find('http://') != -1 or encoded_url.find('https://') != -1)):
+            return False
+
+        try:
+            if encoded_url.find('#') != -1:
+                return self.decode_unicode(encoded_url)
+            else:
+                return self.decode_base64(encoded_url)
+        except:
+            return False
+
+
+
     def decode_uppod_text(self, text):
         Client_codec_a = ["l", "u", "T", "D", "Q", "H", "0", "3", "G", "1", "f", "M", "p", "U", "a", "I", "6", "k", "d", "s", "b", "W", "5", "e", "y", "="]
         Client_codec_b = ["w", "g", "i", "Z", "c", "R", "z", "v", "x", "n", "N", "2", "8", "J", "X", "t", "9", "V", "7", "4", "B", "m", "Y", "o", "L", "h"]

sources/filmon.py

@@ -33,6 +33,7 @@ h = HTMLParser.HTMLParser()
 class Source(SourceBase):
 
     def __init__(self,country="lv",cfg_path=None):
+        #self.hidden = True
         self.name = "filmon"
         self.title = "FilmOn"
         self.img = "http://behindthegloves.com/wp-content/uploads/2016/01/FilmOn-logo1.jpg"

sources/iplayer.py

@@ -278,8 +278,10 @@ Connection: Keep-Alive
                 #if not (c["supplier"].startswith("mf_") or c["supplier"].startswith("ll_")) : continue # TODO ir kaut kādas VPN problēmas ar akamaihd
                 #if c["priority"] <> "1": continue
                 url=c["href"].encode("utf8")
+                #print url.split("/")[2]
                 r2 = self._http_request(url)
-                if not r2: continue
+                if not r2:
+                    continue
                 slist = re.findall("#EXT-X-STREAM-INF:([^\n]+)\n([^\n]+)", r2, re.DOTALL)
                 if not slist:
                     stream = util.item()
@@ -293,6 +295,7 @@ Connection: Keep-Alive
                     stream["subs"]=captions
                     stream["order"]=int(s["bitrate"])
                     stream["nfo"] = nfo
+                    #print url.split("/")[2]
                     streams.append(stream)
                 else:
                     for cc in slist:
@@ -305,6 +308,7 @@ Connection: Keep-Alive
                             uu = url.split("/")[:-1]
                             uu.append(url2)
                             url2 = "/".join(uu)
+                        #print url.split("/")[2]
                         stream = util.item()
                         stream["url"]=url2
                         stream["name"]=title

sources/ltc.py

@@ -83,7 +83,7 @@ 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::meklet?q={0}","","Search in video"),
+                ("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"),
@@ -96,54 +96,28 @@ Accept-Language: en-US,en;q=0.8
             return content
 
         ### Meklēsana video (www )###
-        elif clist == "meklet": #TODO vod/search/{q}
+        elif path == 'viss/search/': #TODO vod/search/{q}
             r = self.call2(data)
-
-            for res in re.findall('<div class="(program follow|movie forward)-link">(.+?</div></div>.*?)</div>', r, re.DOTALL):
-                r2 = res[1]
-                if "movie" in res[0]:
-                    #if not "permalink" in r2:
-                        #continue
-                    m = re.search('<a class="title" href="([^"]+)/">([^<]+)</a>', r2, re.DOTALL)
-                    if not m: continue
-                    title = m.group(2)
-                    data2 = "videonoma" + m.group(1)
-                    #data2 = "arhivs" + m.group(1)
-                    m = re.search('src="([^"]+)"', r2, re.DOTALL)
-                    img = "https://www.lattelecom.tv/"+m.group(1) if m else ""
-                    m = re.search('<div class="introduction">([^<]+)<', r2, re.DOTALL)
-                    desc = m.group(1) if m else ""
-                    m = re.search('class="genre".+?>([^<]+)<', r2, re.DOTALL)
-                    if m:
-                        desc = m.group(1)+"\n"+desc
-
-                else:
-                    m = re.search('<a href="/([^"]+)" class="title">([^<]+)</a>', r2, re.DOTALL)
-                    if not m: continue
-                    title = m.group(2)
-                    data2 = m.group(1)
-                    dd = data2.split("/")
-                    if dd[0]=="arhivs":
-                        ch_name = dd[1]
-                        ch = self.get_channel_by_name(ch_name)
-                        data2 = "archive/get-stream/%s?channelid=%s"%(dd[3],ch["id"]) if ch else ""
-                        #ltc::archive/get-stream/1464120671889?channelid=101
-                    else:
-                        continue
-                    m = re.search(r"url\((.+?)\)", r2, re.DOTALL)
-                    img = "https://www.lattelecom.tv"+m.group(1) if m else ""
-                    m = re.search('<span class="sub">([^<]+)</span>', r2, re.DOTALL)
-                    sub = m.group(1) if m else ""
-                    title = title + " " + sub
+            if "cat=movies" in data:
+                result = re.findall(' class="forward-link" href="/([^"]+)"><img src="([^"]+)".+?class="categorie-one-title">([^<]+)<', r)
+                for item in result:
+                    title = item[2]
+                    data2 = item[0][0:-1]
+                    img = "https://www.lattelecom.tv" + item[1]
                     desc = title
-                content.append((title,self.name+"::"+data2,img,desc))
-            return content
+                    content.append((title,self.name+"::"+data2,img,desc))
+                return content
+            else:
+                return content
 
         ### Tiešraides kanānālu saraksts ###
         elif data=="tiesraide":
             r = self.call2(data)
-            jsdata = re.search("site.program = ([^;]+);",r).group(1)
-            js=json.loads(jsdata)
+            m = re.search("var xprs_ides_array = (.+);", r, re.MULTILINE)
+            if m:
+                js=json.loads(m.group(1))
+            else:
+                raise Exception("Error reading channel list")
             for item in self.get_channels():
                 if item["live"]=='0':continue
                 title = item["name"]
@@ -347,44 +321,56 @@ Accept-Language: en-US,en;q=0.8
             r = self._http_request(url,headers=self.headers2)
             if not r:
                 return content
-            m = re.search('<div class="movie_details"><div class="movie_titles"><div class="en">([^<]+?)</div>', r, re.DOTALL | re.IGNORECASE)
-            raidijums = m.group(1) + " - " if m else ""
+            m = re.search('<div class="movie_titles"><div class="en">([^<]+)</div>', r)
+            raidijums = m.group(1) if m else "Series"
             img0 = re.search('<meta name="og:image" content="([^"]+)">', r).group(1) if re.search('<meta name="dr:say:img" content="([^"]+)">', r) else ""
+            m = re.search('season_choice', r)
 
-            m = re.search('<ul class="episode_choiser".+?(<li>[^<]+</li>)+</ul>', r)
-            if m and not "season_nr" in qs: # ir sezonas
-                for s,it in enumerate(re.findall('<li>([^<]+)</li>', m.group())):
-                    title = "%s%s" % (raidijums, it)
-                    se = re.search("(\d+)",it).group(1)
-                    data2 = path+"?season_nr=%s"%(se)
-                    img = img0
-                    desc = title
-                    content.append((title, self.name + "::" + data2, img, desc))
-                return content
-
-            m = re.search('data-bid="([^"]+)',r)
+            # Ir sezonas
             if m:
-                if not "season_nr" in qs:
-                    qs["season_nr"]="0"
-                url = "https://www.lattelecom.tv/episode-loader.json?bcast_ids=%s&season_nr=%s"%(m.group(1),qs["season_nr"])
-                r = self._http_request(url,headers=self.headers2)
-                i1 = r.find('{"total":')
-                i2 = r.find('}<div class=')
-                js = json.loads(r[i1:i2+1])
-                for item in js["episodes"]:
-                    title = "%s%s (%s)"%(raidijums,item["title"],item["episode_nr"])
-                    data2 = item["url"][1:]
-                    img = "https://www.lattelecom.tv"+item["img"]
-                    desc = title
-                    content.append((title,self.name+"::"+data2,img,desc))
+                result = re.findall(r"""season_choice\('[^']*','[^']*','(\d+)','epizode','([^']*)','','(\d+)',0,0\)">([^<]+)<""", r)
+                if not result:
+                    raise Exception("No seasons find!")
+                vid = result[0][1]
+
+                if not "season_nr" in qs:  # Sezonu saraksts
+                    for s,it in enumerate(result):
+                        title = "%s - %s" % (raidijums, it[3])
+                        data2 = path+"?season_nr=%s"%(it[2])
+                        img = img0
+                        desc = title
+                        content.append((title, self.name + "::" + data2, img, desc))
+                    return content
+
+                else:  # Sezonas epizožu saraksts
+                    if not "season_nr" in qs:
+                        qs["season_nr"]="0"
+                    # https://www.lattelecom.tv/api/episode-loader-design17/0?chunk_size=4&sorting=epizode&series_id=dora_the_explorer
+                    url = "https://www.lattelecom.tv/api/episode-loader-design17/%s?chunk_size=4&sorting=epizode&series_id=%s" % (qs["season_nr"], vid)
+                    r = self._http_request(url,headers=self.headers2)
+                    try:
+                        js = json.loads(r)
+                    except:
+                        raise Exception("Error getting episode list")
+                    result = re.findall(r'class="" href="([^"]+)".+?image:url\(([^ \)]+)\); "></div><div class="episode_titlez_design17">([^<]+)</div><div class="episode_number_design17">([^<]+)</div></a>', js["data"])
+                    for item in result:
+                        title = "%s - %s(%s)"%(raidijums,item[2],item[3])
+                        data2 = item[0][1:]
+                        img = "https://www.lattelecom.tv"+item[1]
+                        desc = title
+                        content.append((title,self.name+"::"+data2,img,desc))
+                    return content
+
+            # Nav sezonu
             else:
-                for item in re.findall('(?si)<a class="elementxxx forward-link[^"]*" href="([^"]+)">.*?<img src="([^"]+)" class="img"><span class="titlez">([^<]+)</span><span class="epizode_number">([^<]+)</span>', r):
-                    title = "%s%s (%s)"%(raidijums,item[2],item[3])
+                result = re.findall(r'class="" href="([^"]+)".+?image:url\(([^ \)]+)\).+?class="episode_titlez_design17">([^<]+)</div><div class="episode_number_design17">([^<]+)</div></a>', r)
+                for item in result:
+                    title = "%s - %s(%s)"%(raidijums,item[2],item[3])
                     data2 = item[0][1:]
                     img = "https://www.lattelecom.tv"+item[1]
                     desc = title
                     content.append((title,self.name+"::"+data2,img,desc))
-            return content
+                return content
 
         ### Videonomas video
         elif clist=="videonoma" and len(data.split("/"))>1:
@@ -758,58 +744,62 @@ Host: manstv.lattelecom.tv
                 hls["streams"].append(s)
         return hls
 
-    def get_stream_url2(self,data):
-        video_id=data[data.find("/")+1:]
-        if not self.is_logedin2():
-            if not self.login2():
-                return []
-            #data2 = self.get_noma_url(video_id)
-        r = self.call2(data)
-        m = re.search('<meta name="dr:say:title" content="([^"]+)">', r, re.IGNORECASE)
+
+    def get_info2(self, data):
+        # Get movie info (for VOD)
         nfo = {}
         tt = lambda p,r,d: re.search(p,r).group(1) if re.search(p,r) else d
-        tt2 = lambda p,r,d: (re.sub("<.+?>","",re.search(p,r).group(1))).split(",") if re.search(p,r) else d
-        r2 = r[r.find('<div class="movie_details">'):]
-        nfo["title"] = tt('<div class="lv">([^<]+)</div>', r2,"")
-        nfo["originaltitle"] = tt('<div class="en">([^<]+)</div>', r2,"")
+        tt2 = lambda p,r,d: (re.sub("[\.]","",re.search(p,r).group(1))).split(", ") if re.search(p,r) else d
+        r = self.call2(data)
+        m = re.search(r'"movie_titles" data-movieid=(\d+)><div class="en">([^<]+)</div><div class="lv translated">([^<]+)</div>', r)
+        if m:
+            title1 = m.group(2)
+            title2 = m.group(3)
+        else:
+            m = re.search('<meta name="dr:say:title" content="([^"]+)">', r, re.IGNORECASE)
+            title1 = title2 = m.group(1) if m else "Video"
+        nfo["title"] = title2
+        nfo["originaltitle"] = title1
         if nfo["originaltitle"] and not nfo["title"]:
-                nfo["title"] = nfo["originaltitle"]
-                #nfo["originaltitle"] = ""
-        if "raidijumi" in data:
-            nfo["set"] = nfo["title"]
-            m = re.search('class="movie_informatio">(.+?)<br>(.+?)<br>', r)
-            ep2,ep1 = m.groups()
-            #nfo["title"]
-            s_nr = tt('<span id="current_season_nr">(\d+)</span>',r,"")
-            for it in  re.findall(r'<span class="epizode_number">(\d+)</span>.+?<span class="titlez">(.+?)</span>', r):
-                if it[1] == ep1:
-                    ep_nr = it[0]
-                    break
+            nfo["title"] = nfo["originaltitle"]
+        if 'episode_switcher_title' in r:
+            title2 = title2.replace("\xe2\x80\x93", "-")
+            if " - " in title2:
+                nfo["set"] = title2.split(" - ")[0]
             else:
-                ep_nr=""
-            if s_nr:
-                nfo["season"] = s_nr
-            if ep_nr:
-                nfo["eposode"] = ep_nr
-            se = "S%02i"%int(s_nr) if s_nr else ""
-            se += "E%02i"%int(ep_nr) if ep_nr else ""
-            nfo["title"] += " - %s"%ep1 if ep1 else ""
-            nfo["originaltitle"] += " - %s"%ep2 if ep2 else ""
-            nfo["title"] += "(%s)"%se if se else ""
-            nfo["originaltitle"] += "(%s)"%se if se else ""
-
+                nfo["set"] = tt('<div class="movie_titles"><div class="en">(.+?)<', r, title2)
+            m = re.search('<div class="serial_switcher_banner active".+?<div class="episode_titlez_design17">([^<]+)</div><div class="episode_number_design17">([^<]+)</div>', r)
+            if m:
+                ep1 = m.group(1)
+                ep2 = m.group(2)
+                nfo["title"] = "%s - %s(%s)"%(nfo["set"], ep1, ep2)
+                nfo["originaltitle"] = nfo["originaltitle"] + "(%s)" % ep2
+            m = re.search("S(\d+)E(\d+)", ep2)
+            if m:
+                nfo["season"] = m.group(1)
+                nfo["eposode"] = m.group(2)
 
         nfo["thumb"] = tt('<meta name="og:image" content="([^"]+)"', r,"")
-        nfo["year"] = tt("Gads: ([^<]+)<", r2, "")
-        nfo["runtime"] = tt("Garums: ([^<]+)<", r2, "")
-        nfo["quality"] = tt("Kvalitāte: ([^<]+)<", r2, "")
-        nfo["genre"]=tt2("Žanr.: (.+?)<br", r2, "")
-        nfo["director"] = tt("Režisors: ([^<]+)<", r2, "")
-        nfo["actor"] = tt2("Lomās: ([^<]+)<", r2, "")
-        nfo["language"] = tt2("Valodas: ([^<]+)<", r2, "")
-        nfo["subtitles"] = tt2("Subtitri: ([^<]+)<", r2, "")
-        nfo["plot"] = tt('"introduction">(.+?)<', r2,"")
+        nfo["thumb"] = nfo["thumb"].replace("http:", "https:")
+        nfo["year"] = tt('movie-informatio-title">Gads<.+?content">([^<]+)<', r, "")
+        nfo["runtime"] = tt('movie-informatio-title">Garums<.+?content">([^<]+)<', r, "")
+        nfo["quality"] = tt('movie-informatio-title">Kvalitāte<.+?content">([^<]+)<', r, "")
+        nfo["genre"]=tt('movie-informatio-title">Žanrs<.+?content">([^<]+)<', r, "")
+        nfo["director"] = tt('movie-informatio-title">Režisors<.+?content">([^<]+)<', r, "")
+        nfo["actor"] = tt2('movie-informatio-title">Aktieri<.+?content">([^<]+)<', r, "")
+        nfo["language"] = tt2('movie-informatio-title">Valodas*<.+?content">([^<]+)<', r, "")
+        nfo["subtitles"] = tt2('movie-informatio-title">Subtitri<.+?content">([^<]+)<', r, "")
+        nfo["plot"] = tt('movie-informatio-title">Apraksts<.+?content">([^<]+)<', r, "")
         nfo["tagline"] = nfo["plot"]
+        return nfo
+
+    def get_stream_url2(self,data):
+        video_id=data[data.find("/")+1:]
+        if not self.is_logedin2():
+            if not self.login2():
+                return []
+            #data2 = self.get_noma_url(video_id)
+        nfo = self.get_info2(data)
         title = util.nfo2title(nfo)
         desc = util.nfo2desc(nfo)
         img = nfo["thumb"]
@@ -1042,6 +1032,8 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
 if __name__ == "__main__":
     c = Source()
     from subprocess import call
+    c.get_info2(sys.argv[1])
+    sys.exit()
 
     if len(sys.argv)>1 and  not "ltc::" in sys.argv[1]:
 

sources/movieplace.py

@@ -33,6 +33,7 @@ h = HTMLParser.HTMLParser()
 class Source(SourceBase):
 
     def __init__(self, country="",cfg_path=None):
+        self.hidden = True # nerāda menu nestrādājošos avotus
         self.name = "movieplace"
         self.title = "MoviePlace.lv"
         self.img = "http://movieplace.lv/images/logo.png"

sources/serialguru.py

@@ -26,6 +26,7 @@ h = HTMLParser.HTMLParser()
 class Source(SourceBase):
 
     def __init__(self,country="",cfg_path=None):
+        self.hidden = True # nerāda menu nestrādājošos avotus
         self.name = "serialguru"
         self.title = "SerialGURU.ru"
         self.img = "http://serialguru.ru/images/xlogo_new.png.pagespeed.ic.0sre2_2OJN.png"

sources/tvdom.cfg

@@ -1,4 +1,6 @@
 [tvdom]
 user = ivars777@gmail.com
 password = kaskade7
+region = lv
+lang = lv
 

sources/tvdom.py

@@ -17,12 +17,16 @@ if "_create_unverified_context" in dir(ssl):
     ssl._create_default_https_context = ssl._create_unverified_context
 
 from SourceBase import SourceBase
+import util
 
-API_URL = 'http://replay.lsm.lv/'
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 headers0 = 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
-""")
+User-Agent: Mozilla/5.0 (Windows NT 6.3; rv:36.0) Gecko/20100101 Firefox/36.04
+Accept: application/json, text/javascript, */*; q=0.01
+Accept-Language: en-US,en;q=0.5
+Accept-Encoding: gzip, deflate, br
+Content-Type: application/x-www-form-urlencoded; charset=UTF-8
+X-Requested-With: XMLHttpRequest""")
 import HTMLParser
 h = HTMLParser.HTMLParser()
 
@@ -34,6 +38,7 @@ class Source(SourceBase):
         self.img = "https://tvdom.tv/front/assets/images/logo.png"
         self.desc = "TVDom.tv portāla satura skatīšanās"
         self.headers = headers0
+        self.url = "https://tvdom.tv/"
 
         self.country=country
         self.session = None
@@ -42,7 +47,7 @@ class Source(SourceBase):
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         if not cfg_path: cfg_path = cur_directory
         self.config_file = os.path.join(cfg_path,self.name+".cfg")
-        self.options = OrderedDict([("user","lietotajs"),("password","parole")])
+        self.options = OrderedDict([("user","lietotajs"),("password","parole"), ("region", "lv"), ("lang", "lv")])
         self.options_read()
 
     def login(self,user="",password=""):
@@ -80,13 +85,16 @@ Referer: https://tvdom.tv/
     def get_content(self, data):
         print "[tvdom] get_content:", data
         source,data,path,plist,clist,params,qs = self.parse_data(data)
-        lang = qs["lang"] if "lang" in qs else self.country
+        lang = self.options["lang"]
+        region = self.options["region"]
         content=[]
         content.append(("..return", "back","","Return back"))
 
         if clist=="home":
             content.extend([
                 ("Live stream", "tvdom::tiesraides","","TV live streams"),
+                ("Archive - last", "tvdom::arhivs?filter=new&page=0&limit=30&region=%s&language=%s" % (region, lang),"","Video archive - last videos"),
+                ("Archive - popular", "tvdom::arhivs?filter=new&page=0&limit=30&region=%s&language=%s"% (region, lang),"","Video archive - popular video"),
                 ("Archive - categories", "tvdom::arhivs","","Video archive by categories"),
                 ("Search", "tvdom::search/?srch-term={0}","","Search archive"),
 
@@ -96,70 +104,51 @@ Referer: https://tvdom.tv/
 
         ### Tiesraides kanalu saraksts ###
         elif data=="tiesraides":
-            ch_name = {"49":"Дом Кино","50":"Карусель","51":"Время","52":"Музыка Первого","53":"Телекафе"}
-            url = "https://tvdom.tv/"
-            r = self._http_request(url)
-            #channels1 = re.findall(r'data-xprs_status="\d" data-href="/tiesraides/([^/]+)/[^"]+">.+?src="([^"]+)" alt="([^"]+)">', r, re.DOTALL)
-            channels2 = re.findall(r'<a class="channel-name">([^<]*)</a>\s+<div class="redirect-to-url" data-href="/tiesraides/([^/]+)/[^"]*">.+?<img style="width:100%;" src="([^"]+)".+?<h3>([^<]+)</h3>.+?<p class="unix">([^<]+)</p>', r, re.DOTALL)
-            channels = {}
-            for item in channels2:
-                title = item[0]
-                title =  h.unescape(title.decode("utf8")).encode("utf8")
-                img = "https://tvdom.tv"+item[2]
-                data2 = "tiesraides/%s/"%item[1]
-                desc = "%s\n%s\n%s"%(title,item[3],item[4])
-                channels[item[1]]={"title":title,"img":img,"desc":desc}
-                #content.append((title,self.name+"::"+data2,img,desc))
-
-            for r2 in re.findall(r'<div class="thumbnail-menu pull-left updater"(.+?)</div>\s+</div>', r, re.DOTALL):
-                ch = re.search('data-href="/tiesraides/([^/]+)/[^"]*"', r2, re.DOTALL).group(1)
-                data2 = "tiesraides/"+ch
-                m = re.search('src="(.+?)" alt="(.+?)">', r2, re.DOTALL)
-                title = m.group(2)
-                img = m.group(1)
-                desc = title
-                if ch in channels:
-                    img = channels[ch]["img"]
-                    desc = channels[ch]["desc"]
-                else:
-                    m = re.search('<img src="([^"]+)" alt="aaaaaa([^"]+)"><h3>.+<p class="unix">([^<]+)</p>', r2, re.DOTALL)
-                    if m:
-                        desc  = "%s\n%s\n%s"%(title,m.group(1),m.group(3))
-                        img = m.group(2)
-                content.append((title,self.name+"::"+data2,img,desc))
+            data1 = "infinity/on_front_filter_channels_list.json"
+            params = "hd=&language=%s&region=%s" % (self.options["lang"], self.options["region"])
+            r = self.call_json(data1, params)
+            for genre in  r["data"]:
+                for item in r["data"][genre]:
+                    ch = item["channel_name"]
+                    title = u"%s - %s" % (item["channel_name"], item["program_title"])
+                    img = "https://tvdom.tv"+item["channel_logo"]
+                    data2 = item["program_url"][1:]
+                    desc = u"%s\n%s-%s"%(title,item["time_start"],item["time_stop"])
+                    content.append((title,self.name+"::"+data2,img,desc))
             return content
 
-        elif clist == "tiesraides":
-            if not self.session:
-                self.login()
-            url = "https://tvdom.tv/" + data
-            headers = self.headers
-            headers["Cookie"] = "PHPSESSID=%s; neverending_story=1;"%self.session
-            r = self._http_request(url,headers=headers)
-            m = re.search("var streamConnectionUrl = '([^']+)'", r, re.DOTALL)
-            if m:
-                data2 = m.group(1)
-            else:
-                return ("No stream found %s"%data,"","","No stream found")
-            m = re.search('title: "([^"]+)"', r, re.DOTALL)
-            title = m.group(1) if m else data2
-            m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
-            desc = m.group(1) if m else title
-            m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
-            desc = m.group(1) if m else title
-            m = re.search('var promo_image *= "([^"]+)', r, re.DOTALL)
-            img = m.group(1) if m else ""
-            return (title,data2,img,desc)
+#         elif clist == "tiesraides":
+#             if not self.session:
+#                 self.login()
+#             url = "https://tvdom.tv/" + data
+#             headers = self.headers
+#             headers["Cookie"] = "PHPSESSID=%s; neverending_story=1;"%self.session
+#             r = self._http_request(url,headers=headers)
+#             m = re.search("var streamConnectionUrl = '([^']+)'", r, re.DOTALL)
+#             if m:
+#                 data2 = m.group(1)
+#             else:
+#                 return ("No stream found %s"%data,"","","No stream found")
+#             m = re.search('title: "([^"]+)"', r, re.DOTALL)
+#             title = m.group(1) if m else data2
+#             m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
+#             desc = m.group(1) if m else title
+#             m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
+#             desc = m.group(1) if m else title
+#             m = re.search('var promo_image *= "([^"]+)', r, re.DOTALL)
+#             img = m.group(1) if m else ""
+#             return (title,data2,img,desc)
 
         ### Search ###
         elif clist=="search":
             url = "https://tvdom.tv/" + data
             r = self._http_request(url)
-            for item in re.findall(r'<li data-xprs-search="\d+" data-href="([^"]+)".*?<img class="img-responsive" src="([^"]+)".*?<h3>([^<]+)</h3>.*?<h5>([^<]+)</h5>', r, re.DOTALL):
-                title = item[2] + " "+ item[3]
+            result = re.findall(r'<div class="film-block_img">\s*<img src="([^"]+).+?<a href="/([^"]+)">([^<]+)</a>\s*</div>\s*<ul class="film-block_descr_tag">\s*<li><a href="">([^<]+)</a>', r, re.DOTALL)
+            for item in result:
+                title = item[2] + " ("+ item[3] + ")"
                 title =  h.unescape(title.decode("utf8")).encode("utf8")
-                img = "https://tvdom.tv" + item[1]
-                data2 = item[0][1:]
+                img = "https://tvdom.tv" + item[0]
+                data2 = item[1]
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
@@ -167,36 +156,103 @@ Referer: https://tvdom.tv/
         ### Arhīva kategorijas ###
         elif data=="arhivs":
             url = "https://tvdom.tv/"+data
+            headers = self.headers
+            headers["Cookie"] = "neverending_story=1; user_selected_language=%s"% (self.options["lang"])
             r = self._http_request(url)
-            for item in re.findall('pointer" href="/([^"]+)">([^<]+)</a>', r, re.DOTALL):
-                title = item[1]
-                title =  h.unescape(title.decode("utf8")).encode("utf8")
+            result = re.findall(r'data-text-mobile="(.+?)" data-id="(\d+)" data-filter-type="archive_genre">', r)
+            for item in result:
+                title = item[0]
                 img = ""
-                data2 = item[0]
+                data2 = "arhivs?" + "genre1=%s&filter=new&region=%s&lang=%s&page=0&limit=30" % (item[1], region, lang)
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
 
         ### Arhīva kategorijas programmas ###
         elif clist=="arhivs":
-            url = "https://tvdom.tv/"+data
-            r = self._http_request(url)
-            for item in re.findall(r"""<li><div class="thumbnail pull-left" onclick="location\.href='([^']+)'" data-toggle="popover" title="([^"]+)" data-content="([^"]*)".+?<img class="img-responsive archive-image" src="([^"]+)""", r, re.DOTALL):
-            #for item in re.findall(r"""<li><div class="thumbnail pull-left" onclick="location\.href='([^']+)'" data-toggle="popover" title="([^"]+)" data-content="([^"]+)".+?<img class="img-responsive archive-image" src="([^"]+)""", r, re.DOTALL):
-                title = item[1].replace("&lt;br&gt;"," - ")
-                title =  h.unescape(title.decode("utf8")).encode("utf8")
-                img = "https://tvdom.tv"+item[3]
-                data2 = item[0][1:]
-                desc = item[2]
+            data1 = "infinity/on_front_archive_get_events2.json"
+            r = self.call_json(data1, params[1:])
+
+            for item in r["data"]:
+                title = item["title"] + "- " + item["online_time"]
+                img = "https://tvdom.tv"+item["image"]
+                data2 = item["url"][1:]
+                desc = u"%s\nlast: %s\npopularity: %s\n%s" % (title, item["online_time"], item["popularity"], item["channel_code"])
                 content.append((title,self.name+"::"+data2,img,desc))
+            if len(r["data"]) == 30:
+                page = int(qs["page"]) + 1
+                data2 = re.sub("page=\d+", "page=%s" % page, data)
+                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
             return content
 
         ### Arhīva programmas video saraksts ###
         elif clist=="play_arhivs" and len(data.split("/"))==3 and not re.search("_\d+",plist[2]):
             url = "https://tvdom.tv/"+data
             r = self._http_request(url)
-            vid=re.search(r"id:(\d+), type: type", r, re.DOTALL).group(1)
+            vid=re.search('materialIdentifier : "(\d+)', r, re.DOTALL).group(1)
+            pname = re.split("[_\.\-]", plist[-1])[0]
             data2 = data+"_"+vid
+            m = re.search(r'var program_title\s*= "(.+?)"', r)
+            title = title0 = m.group(1) if m else data2
+            m = re.search('<p class="content-info__descr-item">(.+?)</p>', r, re.DOTALL)
+            datums = m.group(1).strip() if m else ""
+            title = title + " " + datums
+            m = re.search('<p class="video-player__descr-text" style="height: 100px;">(.+?)<span', r, re.DOTALL)
+            desc = m.group(1).strip() if m else title
+            m = re.search('var share_image\s*= "([^"]+)', r, re.DOTALL)
+            img = m.group(1) if m else ""
+            content.append((title,self.name+"::"+data2,img,desc))
+            i2 = r.find("content  content--indent-pb")
+            r2 = r if i2 == -1 else r[:i2]
+            result = re.findall(r'<img src="([^"]+)" class="content-item__image" alt=""><a href="/([^"]+)" class="content-item__hide-info">.+?<h3 class="content-item__name">\s*<a href="#">\s*([^<]*)\s*<br>\s*([^<]*)\s*</a>\s*</h3>', r2, re.DOTALL)
+            for item in result:
+                if pname not in item[1]:
+                    continue
+                title = item[2] + " " + item[3].strip()
+                title =  h.unescape(title.decode("utf8")).encode("utf8")
+                img = "https://tvdom.tv"+item[0]
+                data2 = item[1]
+                desc = title # TODO
+                content.append((title,self.name+"::"+data2,img,desc))
+            return content
+
+        ### Arhīva video
+#         elif clist=="play_arhivs" and len(data.split("/"))==3 and re.search("_\d+",plist[2]):
+#             url = "https://tvdom.tv/" + data
+#             headers = self.headers
+#             headers["Cookie"] = "PHPSESSID=%s; neverending_story=1;"%self.session
+#             r = self._http_request(url,headers=headers)
+#             m = re.search('var streamConnectionUrl  = "([^"]+)"', r, re.DOTALL)
+#             if m:
+#                 data2 = m.group(1)
+#             else:
+#                 return ("No stream found %s"%data,"","","No stream found")
+#             m = re.search('program_title        = "([^"]+)"', r, re.DOTALL)
+#             title = m.group(1) if m else data2
+#             m = re.search('<a class="episode">Pārraides laiks ēterā: <span>([^<]+)</span></a>', r, re.DOTALL)
+#             datums = m.group(1) if m else ""
+#             title = title + " " + datums
+#             m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
+#             desc = m.group(1) if m else title
+#             m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
+#             desc = m.group(1) if m else title
+#             m = re.search('var share_image *= "([^"]+)', r, re.DOTALL)
+#             img = m.group(1) if m else ""
+#             return (title,data2,img,desc)
+
+    def get_streams(self,data):
+        print "[tvdom] get_streams:", data
+        if not self.is_video(data):
+            return []
+        source,data,path,plist,clist,params,qs = self.parse_data(data)
+        if not self.session:
+            self.login()
+        url = "https://tvdom.tv/" + data
+        headers = self.headers
+        headers["Cookie"] = "PHPSESSID=%s; neverending_story=1;"%self.session
+        r = self._http_request(url,headers=headers)
+
+        if clist == "play_arhivs":
             m = re.search('program_title        = "([^"]+)"', r, re.DOTALL)
             title = m.group(1) if m else data2
             m = re.search('<a class="episode">Pārraides laiks ēterā: <span>([^<]+)</span></a>', r, re.DOTALL)
@@ -208,41 +264,51 @@ Referer: https://tvdom.tv/
             desc = m.group(1) if m else title
             m = re.search('var share_image *= "([^"]+)', r, re.DOTALL)
             img = m.group(1) if m else ""
-            content.append((title,self.name+"::"+data2,img,desc))
-            i = r.find('<span class="slider-top-title"')
-            if i>0: r = r[:i]
-            for item in re.findall('<div class="col-md-9 redirect-to-url same-event" data-href="/([^"]+)">.+?image" src="([^"]+)".+?<h3 class="same-title">([^<]+)</h3>.*?<h5 class="same-online">([^<]+)</h5>', r, re.DOTALL):
-                title = item[2] + " " + item[3]
-                title =  h.unescape(title.decode("utf8")).encode("utf8")
-                img = "https://tvdom.tv"+item[1]
-                data2 = item[0]
-                desc = title # TODO
-                content.append((title,self.name+"::"+data2,img,desc))
-            return content
 
-        ### Arhīva video
-        elif clist=="play_arhivs" and len(data.split("/"))==3 and re.search("_\d+",plist[2]):
-            url = "https://tvdom.tv/" + data
-            headers = self.headers
-            headers["Cookie"] = "PHPSESSID=%s; neverending_story=1;"%self.session
-            r = self._http_request(url,headers=headers)
-            m = re.search('var streamConnectionUrl  = "([^"]+)"', r, re.DOTALL)
+            m = re.search(r"var streams\s*= ({[^;]+);", r, re.DOTALL)
+            if not m:
+                raise Exception("No stream found")
+            js = json.loads(m.group(1))
+            streams = []
+            for st in js:
+                if st == "qualities": continue
+                s = js[st]
+                data2 = s["url"]
+                stream = util.item()
+                stream["name"] = title
+                stream["url"] = data2
+                stream["img"] = img
+                stream["desc"] = desc
+                stream["resolver"] = "tvdom"
+                stream["quality"] = st
+                stream["order"] = int(st[:-1])
+                streams.append(stream)
+
+            streams = sorted(streams,key=lambda item: item["order"],reverse=True)
+            return streams
+
+        # Tiešraides video
+        else:
+            m = re.search("var streamConnectionUrl = '([^']+)'", r, re.DOTALL)
             if m:
                 data2 = m.group(1)
             else:
-                return ("No stream found %s"%data,"","","No stream found")
-            m = re.search('program_title        = "([^"]+)"', r, re.DOTALL)
+                raise Exception("No stream found")
+            m = re.search('title: "([^"]+)"', r, re.DOTALL)
             title = m.group(1) if m else data2
-            m = re.search('<a class="episode">Pārraides laiks ēterā: <span>([^<]+)</span></a>', r, re.DOTALL)
-            datums = m.group(1) if m else ""
-            title = title + " " + datums
             m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
             desc = m.group(1) if m else title
             m = re.search('<div id="panel">([^<]+)<', r, re.DOTALL)
             desc = m.group(1) if m else title
-            m = re.search('var share_image *= "([^"]+)', r, re.DOTALL)
+            m = re.search('var promo_image *= "([^"]+)', r, re.DOTALL)
             img = m.group(1) if m else ""
-            return (title,data2,img,desc)
+            stream = util.item()
+            stream["name"] = title
+            stream["url"] = data2
+            stream["img"] = img
+            stream["desc"] = desc
+            stream["resolver"] = "tvdom"
+            return [stream]
 
 
     def is_video(self,data):
@@ -255,13 +321,6 @@ Referer: https://tvdom.tv/
         else:
             return False
 
-    def call(self, data,headers=headers0,lang=""):
-        if not lang: lang = self.country
-        url = API_URL%lang + data
-        #print "[TVPlay Api] url: ",url
-        result = []
-        content = self._http_request(url)
-        return content
 
 if __name__ == "__main__":
     country= "lv"

sources/ustvnow.py

@@ -33,6 +33,7 @@ h = HTMLParser.HTMLParser()
 class Source(SourceBase):
 
     def __init__(self,country="lv",cfg_path=None):
+        self.hidden = True
         self.name = "ustvnow"
         self.title = "USTVNow"
         self.img = "http://watch.ustvnow.com/assets/ustvnow/img/ustvnow_og_image.png"
@@ -117,7 +118,14 @@ class Source(SourceBase):
         ### Tiesraides kanāls ###
         elif path == "live/view":
             url = "http://m-api.ustvnow.com/stream/1/%s"%data
-            r = self._http_request(url)
+            #url = "http://m.ustvnow.com/stream/1/live/view?scode=whphd&token=o7oxits4dcjd8hbxusf9d9cgcyad&br_n=Chrome&br_v=60&br_d=desktop"
+            url =  "http://m.ustvnow.com/stream/1/live/%s"%data
+            headers = headers2dict("""
+Accept: application/json, text/javascript, */*; q=0.01
+User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36
+Referer: http://watch.ustvnow.com/guide
+                """)
+            r = self._http_request(url, headers=headers )
             if not r:
                 return ("No stream found %s"%data,"","","No stream found")
             r = json.loads(r)

sources/viaplay.py

@@ -37,6 +37,7 @@ headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitli
 class Source(SourceBase):
 
     def __init__(self,language="en",cfg_path=None):
+        self.hidden = True # nerāda menu nestrādājošos avotus
         self.name = "viaplay"
         self.title = "viaplay.lv"
         self.img = "https://yt3.ggpht.com/-noVdjbNR-V8/AAAAAAAAAAI/AAAAAAAAAAA/yZ9XNP5urLY/s900-c-k-no-mo-rj-c0xffffff/photo.jpg"