0.6a

sources/SourceBase.py

@@ -9,6 +9,8 @@
 import urllib2, urllib
 import datetime, re, sys,os
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 from collections import OrderedDict
 import ConfigParser
 try:
@@ -64,6 +66,14 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
         stream["type"] = stream_type(content[1]).encode("utf8")
         return[stream]
 
+    def get_epg(self,data):
+        ### Normally to be overrided in child class
+        return [self.get_info(data)]
+
+    def get_info(self,data):
+        streams = self.get_streams(data)
+        return streams[0] if streams else {}
+
     def options_read(self):
         if not ("options" in dir(self) and self.options): # process options only if self.options defined, self.config_file should be defined too
             return None
@@ -103,9 +113,9 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
             headers = self.headers if "headers" in dir(self) else headers2dict("User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:49.0) Gecko/20100101 Firefox/49.0")
         try:
             if params:
-                r = requests.post(url, data=params, headers=headers)
+                r = requests.post(url, data=params, headers=headers,verify=False)
             else:
-                r = requests.get(url, headers=headers)
+                r = requests.get(url, headers=headers,verify=False)
             return r.content
         except Exception as ex:
             if "read" in ex:
@@ -138,7 +148,7 @@ def stream_type(data):
     data = data.lower()
     m = re.search(r"^(\w+)://", data)
     prefix = m.group(1) if m else ""
-    if prefix in ("http","https") and "m3u8" in data:
+    if prefix in ("http","https") and ".m3u8" in data:
         return "hls"
     elif prefix == "http":
         return "http"

sources/config.py

@@ -11,15 +11,16 @@ from SourceBase import SourceBase
 
 os.path.dirname(os.path.abspath(__file__))
 class Source(SourceBase):
-    
+
     def __init__(self,country="lv"):
         self.name = "config"
         self.country=country
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         self.streams_file = os.path.join(cur_directory,"streams.cfg")
         self.lists = collections.OrderedDict()
+        self.titles = {}
         self.read_streams()
-         
+
     def get_content(self, data):
         self.read_streams()
         if "::" in data:
@@ -30,7 +31,7 @@ class Source(SourceBase):
 
     def is_video(self,data):
         return False
-    
+
     def read_streams(self):
         for line in open(self.streams_file,"r"):
             r = re.search("^\[(\w+)\]", line)
@@ -38,12 +39,14 @@ class Source(SourceBase):
                 name = r.group(1)
                 self.lists[name] = []
             else:
-                if len(line)<10 or line[0] in ("#"): continue
+                if line[0] in ("#"): continue
                 items = tuple(line.strip().split("|"))
-                if len(items)<2:
-                    continue
-                self.lists[name].append(items)
-                
+                if not items[0]: continue
+                if len(items)==1:
+                    self.titles[name] = items[0]
+                else:
+                    self.lists[name].append(items)
+
     def write_streams(self):
         f = open(self.streams_file,"w")
         for l in self.lists.keys():
@@ -52,48 +55,54 @@ class Source(SourceBase):
                 f.write("%s|%s|%s|%s\n"%(item[0],item[1],item[2],item[3]))
             f.write("\n")
         f.close()
-    
+
     def get_lists(self):
         return self.lists.keys()
-    
+
     def get_list_items(self,name):
         return self.lists[name]
-    
+
+    def get_title(self,name):
+        if name in self.titles:
+            return self.titles[name]
+        else:
+            return name
+
     def add_list(self,name):
         if not name in self.lists.keys():
             self.lists[name] = []
-            
+
     def del_list(self,name):
         if name in self.lists.keys():
             del self.lists[name]
-            
+
     def add_item(self,name,item,pos=None):
         if name in self.lists.keys():
             if pos==None:
                 self.lists[name].append(item)
             else:
                 self.lists[name].insert(pos,item)
-                
+
     def del_item(self,name,pos):
         self.lists[name].pop(pos)
-    
+
     def replace_item(self,name,item,pos):
         self.lists[name][pos]=item
-            
-                           
+
+
 if __name__ == "__main__":
     c = Source()
     content = c.get_content("home")
     for item in content: print item
     #c.del_item("home",0)
     #c.del_list("favorites")
-    
+
     #c.add_item("home",("My Streams","config::favorites","","Mani saglabātie TV kanāli un video"),0)
     c.replace_item("home",("My Streams","config::my_streams","default","Mani saglabātie TV kanāli un video"),0)
     #c.add_list("favorites")
-    #c.add_item("favorites",("..return","back","","Atgriezties atpakaļ"))    
+    #c.add_item("favorites",("..return","back","","Atgriezties atpakaļ"))
     #c.add_item("favorites",("LTV1","http://streamltv.cloudy.services/ltv/LTV02.smil/playlist.m3u8","picons/latvia1.png", "Latvijas televīzijas 1.kanāls"))
-    
+
     c.write_streams()
     for item in content: print item
-    
+

sources/iplayer.cfg

@@ -1,4 +1,4 @@
 [iplayer]
-user = lietotajs
-password = parole
+user = ivars777@gmail.com
+password = kaskade7
 

sources/iplayer.py

@@ -239,11 +239,11 @@ Connection: Keep-Alive
         cmd = data.split("/")
         vid = cmd[1].split("?")[0]
         if cmd[0] == "live":
-            title,img,desc = self.get_epg_live(vid)
+            title,img,desc,nfo = self.get_epg_live(vid)
         else:
-            data_ = "episodes/%s"%vid
-            r = self.call(data_)
-            title,img,desc,vid = self.get_epg_video(vid)
+            #data_ = "episodes/%s"%vid
+            #r = self.call(data_)
+            title,img,desc,vid,nfo = self.get_epg_video(vid)
         url = "http://open.live.bbc.co.uk/mediaselector/5/select/version/2.0/format/json/mediaset/iptv-all/vpid/%s"%vid
         print "vid=%s"%vid
         print url
@@ -288,6 +288,7 @@ Connection: Keep-Alive
                     stream["lang"]="en"
                     stream["subs"]=captions
                     stream["order"]=int(s["bitrate"])
+                    stream["nfo"] = nfo
                     streams.append(stream)
                 else:
                     for cc in slist:
@@ -310,6 +311,7 @@ Connection: Keep-Alive
                         stream["lang"]="en"
                         stream["subs"]=captions
                         stream["order"]=int(bitrate)
+                        stream["nfo"] = nfo
                         streams.append(stream)
         if captions:
             for s in streams:
@@ -360,6 +362,7 @@ Connection: Keep-Alive
 
     def get_epg_video(self,vid):
         data = "episodes/%s"%vid
+        nfo = {}
         r = self.call(data)
         if "episodes" in r :
             ep = r["episodes"][0]
@@ -371,18 +374,38 @@ Connection: Keep-Alive
             desc = desc
             ver = ep["versions"][0]
             vid = ver["id"]
-            remaining = ver["availability"]["remaining"]["text"]
-            duration = ver["duration"]
+            remaining = ver["availability"]["end"].split("T")[0] #["remaining"]["text"]
+            duration = ver["duration"]["text"]
             first_broadcast = ver["first_broadcast"]
             desc =u"%s\n%s\%s\n%s\n%s"%(title,duration,remaining,first_broadcast,desc)
             img = ep["images"]["standard"].replace("{recipe}","512x288")
-            return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8"),vid.encode("utf8")
+
+            #Create nfo dictionary
+            tt = lambda dd,k,d: dd[k] if k in dd else d
+            nfo_type = "tvshow" if True else "movie"
+            t = OrderedDict()
+            t["title"] = title
+            t["originaltitle"] = tt(ep,"original_title","")
+            t["thumb"] = img
+            t["id"] = vid
+            t["outline"] = ep["synopses"]["small"] if "small" in ep["synopses"] else ep["synopses"]["editorial"] if "editorial" in ep["synopses"] else ""
+            t["plot"] = ep["synopses"]["large"] if "large" in ep["synopses"] else ep["synopses"]["medium"] if "medium" in ep["synopses"] else p["synopses"]["small"] if "small" in ep["synopses"] else title
+            t["tagline"] = ep["synopses"]["editorial"] if "editorial" in ep["synopses"] else ""
+            t["runtime"] = tt(ver["duration"],"text","")
+            t["premiered"] = tt(ep,"release_date","")
+            t["aired"] = ver["availability"]["start"].split("T")[0] if "start" in ver["availability"] else ""
+            if "parent_position" in ep: t["episode"] = ep["parent_position"]
+
+            nfo[nfo_type] = t
+
+            return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8"),vid.encode("utf8"),nfo
         else:
             raise Exception("No video info")
 
     def get_epg_live(self,channelid):
         data = "channels/%s/highlights?live=true"%channelid
         r = self.call(data)
+        nfo = {}
         if "channel_highlights" in r and r["channel_highlights"]["elements"][0]["id"] == "live":
             epg = r["channel_highlights"]["elements"][0]["initial_children"][0].copy()
             t1 = gt(epg['scheduled_start'])
@@ -403,7 +426,7 @@ Connection: Keep-Alive
             img = ""
             desc = title
 
-        return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8")
+        return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8"),nfo
 
     def get_channels(self):
         if self.ch:
@@ -465,6 +488,8 @@ Connection: Keep-Alive
     def _http_request(self, url,params = None, headers=None):
         if not headers: headers = self.headers
         import requests
+        from requests.packages.urllib3.exceptions import InsecureRequestWarning
+        requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
         try:
             r = requests.get(url, headers=headers)
             return r.content

sources/ltc.cfg

@@ -1,4 +1,4 @@
 [ltc]
-user = lietotajs
-password = parole
+user = ivars777
+password = kaskade7
 

sources/ltc.py

@@ -902,8 +902,8 @@ Referer: https://www.lattelecom.tv/
             raise Exception(u"kļūda ielogojoties")
         html = response.read()
         if not '"success":true' in html:
-            err = re.search('"error":"(.+?)"').group(1) if re.search('"error":"(.+?)"') else ""
-            raise Exception(u"Kļūda ielogojoties - %s"%err)
+            err = re.search('"error":"(.+?)"',html).group(1) if re.search('"error":"(.+?)"',html) else ""
+            raise Exception(u"Kļūda ielogojoties - %s"%err.decode("utf8"))
         self.session_id = session_id
         self.headers2["Cookie"] = "%s; "%(self.session_id)
         self.error = ""

sources/streams.cfg

@@ -1,4 +1,5 @@
 [home]
+Home
 My TV|config::my_tv|default|Mani TV kanāli (tiešraide)
 My TV archive|config::my_archive|default|Mani TV arhīvu video
 My Video|config::my_video||Mani video
@@ -19,9 +20,10 @@ SerialGURU.ru|serialguru::home|http://serialguru.ru/images/xlogo_new.png.pagespe
 USTVNow|ustvnow::home|http://watch.ustvnow.com/assets/ustvnow/img/ustvnow_og_image.png|USTVNow kanālu tiešraide
 FilmOn|filmon::home|http://behindthegloves.com/wp-content/uploads/2016/01/FilmOn-logo1.jpg|FilmOn - tiešraides un video (dažādās valodās)
 MTGPlay|config::mtg|https://www.mtg.com/wp-content/uploads/2015/11/MTG-Logo-Medium-Red-PNG.png|Other countries MTG media portals content
-
+Filmas.lv|filmas::home|https://www.filmas.lv/wp-content/uploads/2013/06/LVfilmas-logo-jauns21.png|Filmas.lv - Latvijas filmas
 
 [my_tv]
+My Tv
 ..return|back|default|Atgriezties atpakaļ
 LTV1|replay::tiesraide/ltv1/|http://replay.lsm.lv/resources/logo/large_ltv1.png|LTV1 tiesraide (video )
 LTV7|replay::tiesraide/ltv7/|http://replay.lsm.lv/resources/logo/large_ltv7.png|LTV7 tiesraide (video )
@@ -43,6 +45,7 @@ Canadian live (FilmOn)|filmon::group?id=44|https://static.filmon.com/assets/grou
 Sport stream|rtmp://184.172.124.216/live/test111||
 
 [my_archive]
+My Archive
 ..return|back||Atgriezties atpakaļ
 LTV arhīvs LV|replay::visi/jaunakie/?source=ltv&lang=lv|http://replay.lsm.lv/apple-touch-icon.png|LTV1, LTV2 pārraižu arhīvs LV
 LTV arhīvs RU|replay::vse/novie/?source=ltv&lang=ru|http://replay.lsm.lv/apple-touch-icon.png|LTV1, LTV2 pārraižu arhīvs RU
@@ -55,11 +58,13 @@ Category - News|euronews::content/getVertical?lang=en&byPage=40&page=1&vId=1|htt
 Latest programs|euronews::content/getLatestPrograms?lang=en&byPage=40&page=1|http://pbs.twimg.com/profile_images/732665354242150400/tZsCnjuh_400x400.jpg|Latest programs
 
 [my_video]
+My Video
 ..return|back||Atgriezties atpakaļ
 Все фильмы|filmix::films|http://cs5324.vk.me/g33668783/a_903fcc63.jpg|Все фильмы
 Все сериалы|filmix::serialy|http://cs5324.vk.me/g33668783/a_903fcc63.jpg|Все сериалы
 
 [my_kids]
+My Kids
 ..return|back|default|Atgriezties atpakaļ
 Bērnu TV|config::my_kids_tv||Bērnu TV kanāli
 Bērnu video|config::my_kids_video||Saglabātie bērnu video
@@ -74,6 +79,7 @@ Filmix bērnu seriāli|filmix::detskij/s7|http://cs5324.vk.me/g33668783/a_903fcc
 SerialGURU multenes|serialguru::mult||SerialGURU multenes
 
 [my_kids_tv]
+My Kids TV
 ..return|back|default|Atgriezties atpakaļ
 Kidzone|ltc::content/live-streams/951?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/kidzone2_new.png|Kidzone
 Nickelodeon|ltc::content/live-streams/302?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/Nickelodeon.png|Nickelodeon
@@ -86,9 +92,11 @@ CBBC (FilmOn)|filmon::channel?id=29|http://static.filmon.com/assets/channels/29/
 Om Nom (FilmOn)|filmon::channel?id=3824|http://static.filmon.com/assets/channels/3824/big_logo.png|The series chronicles Om Nom's adventures with a young boy named Evan, beginning  with the little monster's mysterious appearance on the boy's doorstep in Episode 1. The animation series goes on to reveal Om Nom's mischievous, yet endearing personality as he and Evan bond over day-to-day activities such as playing games, exploring house-hold items and celebrating holidays.
 
 [my_kids_video]
+My Kids Video
 ..return|back|default|Atgriezties atpakaļ
 
 [my_radio]
+My Radio
 ..return|back|default|Atgriezties atpakaļ
 LR1|replay::tiesraide/lr1/|http://replay.lsm.lv/resources/logo/lr1_logo.png|LR1 tiesraide (audio)
 LR2|replay::tiesraide/lr2/|http://replay.lsm.lv/resources/logo/lr2_logo.png|LR2 tiesraide (audio)
@@ -98,6 +106,7 @@ LR5|replay::tiesraide/lr5/|http://replay.lsm.lv/resources/logo/lr5_logo.png|LR5
 LR6|replay::tiesraide/lr6/|http://replay.lsm.lv/resources/logo/lr6_logo.png|LR6 tiesraide (audio)
 
 [mtg]
+MTG
 ..return|back|default|Atgriezties atpakaļ
 Estonia (tv3play.ee)|mtgplay::home?country=ee||MTG Estonia media portal content
 Lithuania (play.tv3.lt/)|mtgplay::home?country=lt||MTG Lithuania media portal content

sources/tvdom.cfg

@@ -1,4 +1,4 @@
 [tvdom]
-user = lietotajs
-password = parole
+user = ivars777@gmail.com
+password = kaskade7
 

sources/tvdom.py

@@ -42,7 +42,7 @@ class Source(SourceBase):
         self.options_read()
 
     def login(self,user="",password=""):
-        self.options_read()        
+        self.options_read()
         if not user: user=self.options["user"]
         if not password: password = self.options["password"]
         headers = headers2dict("""
@@ -57,10 +57,12 @@ Referer: https://tvdom.tv/
         url = "https://tvdom.tv/infinity/on_register_user"
         params = "email=%s&password=%s&remember=false&auth_type=login"%(user,password)
         import requests
-        r = requests.post(url, data=params, headers=headers)	
+        from requests.packages.urllib3.exceptions import InsecureRequestWarning
+        requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+        r = requests.post(url, data=params, headers=headers)
         js = json.loads(r.content)
         if 'success' in r.content:
-            self.token = js["access_token"] 
+            self.token = js["access_token"]
             if 'PHPSESSID' in r.cookies:
                 self.session = r.cookies["PHPSESSID"]
             return True
@@ -98,7 +100,7 @@ Referer: https://tvdom.tv/
                 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])		    
+                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))
 
@@ -137,9 +139,9 @@ Referer: https://tvdom.tv/
             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 
+            desc = m.group(1) if m else title
             m = re.search('var promo_image *= "([^"]+)', r, re.DOTALL)
-            img = m.group(1) if m else ""            
+            img = m.group(1) if m else ""
             return (title,data2,img,desc)
 
         ### Search ###
@@ -196,10 +198,10 @@ Referer: https://tvdom.tv/
             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 
+            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)) 
+            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):
@@ -230,9 +232,9 @@ Referer: https://tvdom.tv/
             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 
+            desc = m.group(1) if m else title
             m = re.search('var share_image *= "([^"]+)', r, re.DOTALL)
-            img = m.group(1) if m else ""            
+            img = m.group(1) if m else ""
             return (title,data2,img,desc)
 
 

sources/ustvnow.cfg

@@ -1,4 +1,4 @@
 [ustvnow]
-user = lietotajs
-password = parole
+user = ivars777@gmail.com
+password = kaskade7
 

sources/ustvnow.py

@@ -12,6 +12,7 @@ except:
 
 import urllib2, urllib
 import datetime, re, sys,os
+import traceback
 from collections import OrderedDict
 from SourceBase import SourceBase
 
@@ -43,9 +44,9 @@ class Source(SourceBase):
         self.options_read()
 
     def login(self,user="",password=""):
+        self.options_read()
         if not user: user=self.options["user"]
         if not password: password = self.options["password"]
-        self.options_read()        
         headers = headers2dict("""
         Host: m-api.ustvnow.com
         Accept-Language: en-US,en;q=0.5
@@ -64,9 +65,9 @@ class Source(SourceBase):
             return False
 
     def get_content(self, data):
-        print "[tvdom] get_content:", data
+        print "[ustvnow] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
@@ -100,7 +101,7 @@ class Source(SourceBase):
             if not self.r:
                 return content
             for item in self.r["results"]:
-                if item["order"] == 1:    
+                if item["order"] == 1:
                     title = item["stream_code"]
                     title =  h.unescape(title.decode("utf8")).encode("utf8")
                     img = "http://m-api.ustvnow.com/"+item["prg_img"] #item["img"]
@@ -116,6 +117,10 @@ class Source(SourceBase):
             if not r:
                 return ("No stream found %s"%data,"","","No stream found")
             r = json.loads(r)
+            if not "r" in dir(self):
+                if not self.token:
+                    self.login()
+                self.r = self.call("live/channelguide?token=%s"%self.token)
             if self.r:
                 ch = qs["scode"]
                 for item in self.r["results"]:
@@ -129,8 +134,8 @@ class Source(SourceBase):
                 title = data
             data2 = r["stream"]
             desc = title
-            img = ""          
-            return (title,data2,img,desc)               
+            img = "" # img TODO
+            return (title,data2,img,desc)
 
     def is_video(self,data):
         if "::" in data:

sources/viaplay.cfg

@@ -1,5 +1,5 @@
 [viaplay]
-user = change_user
-password = change_password
+user = ivars777@gmail.com
+password = kaskade7
 device = 
 

sources/viaplay.py

@@ -10,7 +10,10 @@ try:
 except:
     import simplejson as json
 
-import requests, urlparse, urllib
+import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
+import urlparse, urllib
 import datetime, time,re, sys,os
 from collections import OrderedDict
 from SourceBase import SourceBase