Tkinter run u.c.

ContentSources.py

@@ -20,7 +20,7 @@ class ContentSources(object):
     #----------------------------------------------------------------------
     def __init__(self, plugin_path):
         self.plugins = {}
-        self.error_content = [("..atpakaļ", "back", None, "Kļūda, atgriezties atpakaļ")]
+        self.error_content = [("..atpakaļ", "back", "back.png", "Kļūda, atgriezties atpakaļ")]
         sys.path.insert(0, plugin_path)
         #for f in os.listdir(plugin_path):
         #for f in next(os.walk(plugin_path))[2]:
@@ -165,100 +165,12 @@ class ContentSources(object):
         else:
             return None
 
-
-
-def run(data="config::home"):
-
-    sources = ContentSources("sources")
-    #options = sources.options_read("ltc")
-    #print options
-    history = []
-    cur = ("Home",data,None,None)
-    content = sources.get_content(cur[1])
-
-    exit_loop = False
-    while True:
-        print
-        for i,item in enumerate(content):
-            s = "%i: %s - %s %s"%(i,item[0],item[1],item[2])
-            print s #.encode(sys.stdout.encoding,"replace")
-
-        while True:
-            a = raw_input("Enter number, (-) for download, q for exit: ")
-            if a in ("q","Q","x","X"):
-                exit_loop = True
-                print "Exiting"
-                break
-            try:
-                n = int(a)
-                break
-            except:
-                print "Not number!"
-        if exit_loop: break
-        download = False
-        if n<0:
-            n = abs(n)
-            download = True
-        cur2 = content[n]
-        data0 = cur2[1].split("::")[1] if "::" in cur2[1] else cur2[1]
-        if not data0:
-            pass
-        elif cur2[1] == "back":
-            cur = history.pop()
-        elif sources.is_video(cur2[1]):
-            if sources.stream_type(cur2[1]):
-                stream = util.item()
-                stream["url"] = cur2[1]
-                stream["name"] = cur2[0]
-                streams = [stream]
-            else:
-                try:
-                    if not download:
-                        streams = sources.get_streams(cur2[1])
-                    else:
-                        stream = util.item()
-                        stream["url"] = cur2[1]
-                        stream["name"] = cur2[0]
-                        stream["url"] = util.streamproxy_encode2(stream["url"])
-                        print stream["url"]
-                        streams = [stream]
-                except Exception as e:
-                    print unicode(e)
-                    traceback.print_exc()
-                    streams = []
-            if streams:
-                if not download:
-                    util.play_video(streams)
-                else:
-                    #urlp = util.streamproxy_encode2(streams[0]["url"])
-                    #print urlp
-                    #util.player(urlp)
-                    #Downloader.download_video(streams)
-                    pass
-            else:
-                print "**No stream to play - %s "%(
-                    cur2[1])
-                raw_input("Press any key")
-            #import os
-            #os.system('"c:\Program Files (x86)\VideoLAN\VLC\vlc.exe" "%s"'%cur2[1])
-
-        else:
-            if "{0}" in cur2[1]:
-                a = raw_input("Enter value:")
-                cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])
-            history.append(cur)
-            cur = cur2
-        try:
-            content = sources.get_content(cur[1])
-        except Exception as e:
-            print unicode(e)
-            traceback.print_exc()
-            raw_input("Continue?")
-
 if __name__ == "__main__":
+    from run import run
     show_hidden = False
     if len(sys.argv)>1:
         data= sys.argv[1]
     else:
         data = "config::home"
-    run(data)
+    sources = ContentSources("sources")
+    run(sources, data)

run.py

@@ -0,0 +1,505 @@
+#!/usr/bin/env python
+# coding=utf8
+import sys, os, traceback
+from Tkinter import *
+try:
+    from ttk import *
+except:
+    pass
+import tkMessageBox as tkm
+import tkSimpleDialog as tkd
+
+import PIL, StringIO
+from PIL import ImageTk, Image
+import requests, urllib2
+
+from ContentSources import ContentSources
+from sources.SourceBase import stream_type
+import util
+
+
+class Main(Frame):
+
+    def __init__(self, sources):
+        self.root = Tk()
+        self.root.geometry("1050x600")
+        Frame.__init__(self, self.root)
+        #self.pack()
+        self.pack(fill=BOTH, expand=1)
+        self.initUI()
+        items = ["item %s" % i for i in range(20)]
+        if sources:
+            self.sources = sources
+        else:
+            self.sources = ContentSources("sources")
+        self.picons_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "picons")
+        self.tmp_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "tmp")
+        if not os.path.exists(self.tmp_path):
+            os.mkdir(self.tmp_path)
+        self.history = []
+        self.cur_index = 0
+        self.cur = ("Home", "config::home", "", "PlayStream home")
+
+    def initUI(self):
+        self.master.title("PlayStream")
+        self.txt1 = Label(self)
+        self.txt1.pack(side=TOP, fill=X, padx=15)
+        self.txt1.configure(font=("Tahoma", 14, "bold"))
+        self.txt1.config(text="")
+        self.txt2 = Label(self)
+        self.txt2.pack(side=TOP, fill=X, padx=15)
+        self.txt2.config(text="")
+        self.txt2.configure(font=("Tahoma", 12))
+
+        frame1 = Frame(self)
+        frame1.pack(side=TOP, fill=X, padx=15)
+        scrollbar = Scrollbar(frame1, orient=VERTICAL)
+        self.listbox = Listbox(frame1, width=80, height=30, yscrollcommand=scrollbar.set)
+        scrollbar.config(command=self.listbox.yview)
+        #self.listbox.config(yscrollcommand=scrollbar.set)
+        self.listbox.pack(side=LEFT)
+        scrollbar.pack(side=LEFT, fill=Y)
+        self.listbox.focus_set()
+        self.listbox.bind('<<ListboxSelect>>', lambda evt: self.list_action(evt, "Changed"))
+        self.listbox.bind('<Double-1> ', lambda evt:self.list_action(None, "Return"))
+        self.listbox.bind('<Key> ', self.list_action)
+
+        self.pic = Canvas(frame1, width=400, height=250)
+        self.pic.pack(side=TOP, expand=1)
+
+        frame2 = Frame(frame1, height=250, width=400)
+        frame2.pack(side=TOP)
+        scrollbar2 = Scrollbar(frame2)
+        self.desc = Text(frame2, height=15, width=70, wrap="word", yscrollcommand=scrollbar2.set)  #, borderwidth=0, highlightthickness=0)
+        scrollbar2.config(command=self.desc.yview)
+        scrollbar2.pack(side="right", fill="y")
+        self.desc.configure(font=("Tahoma", 10))
+        self.desc.pack(anchor=N)
+
+        frame3 = Frame(self, height=40)
+        frame3.pack(side=TOP, fill=X, padx=15)
+        self.b_select = Button(frame3, text="Select",
+                              command=lambda :self.list_action(None, "Return"), width=10)
+        self.b_select.pack(side=LEFT, anchor=S)
+
+        self.b_back = Button(frame3, text="Back",
+                                   command=lambda :self.list_action(None, "Escape"), width=10)
+        self.b_back.pack(side=LEFT, anchor=S)
+
+        self.b_options = Button(frame3, text="Options",
+                                 command=lambda :self.list_action(None, "Options"), width=10)
+        self.b_options.pack(side=LEFT, anchor=S)
+
+        self.b_config = Button(frame3, text="Config",
+                                 command=lambda :self.list_action(None, "Config"), width=10)
+        self.b_config.pack(side=LEFT, anchor=S)
+
+        self.b_exit = Button(frame3, text="Exit",
+                            command=self.quit, width=10)
+        self.b_exit.pack(side=LEFT, anchor=S)
+
+    def list_select(self):
+        w = evt.widget
+        cs = int(w.curselection()[0])
+        value = w.get(cs)
+        #print 'You selected item %d: "%s"' % (index, value)
+
+    def list_key(self, evt):
+        w = evt.widget
+        cs = int(w.curselection()[0])
+        value = w.get(cs)
+        key = evt.keysym
+        #print 'Key %s' % (key)
+        self.cur_index = cs
+        self.list_action(key)
+
+    def list_action(self, evt=None, key=None):
+        cs = int(self.listbox.curselection()[0])
+        self.cur_index = cs
+        if (not key) and evt:
+            w = evt.widget
+            value = w.get(cs)
+            key = evt.keysym
+        print 'Key %s' % (key)
+        data = self.content[cs][1]
+        cur2 = self.content[cs]
+
+        if key == "Changed":
+            self.show_desc()
+            self.show_pic()
+
+        elif key == "Return" and data <> "back":
+            if not self.sources.is_video(data):
+                if "{0}" in data:
+                    a = tkd.askstring("Search", "Search for")
+                    cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])
+                self.history.append((self.cur, cs))
+                self.cur = self.content[cs]
+                self.cur_index = 0
+                try:
+                    self.show_content(cur2)
+                except Exception as e:
+                    print unicode(e)
+                    traceback.print_exc()
+                    tkm.showerror("Error getting content", unicode(e))
+                    prev = self.history.pop()
+                    self.cur = prev[0]
+                    self.cur_index = prev[1]
+                    self.show_content(self.cur, self.cur_index)
+                    return
+            else:
+                self.play_video(self.content[cs])
+                self.listbox.selection_set(self.cur_index)
+                self.listbox.activate(self.cur_index)
+                self.listbox.focus_set()
+
+        elif key == "BackSpace" or key == "Escape" or (key == "Return" and data == "back"):
+            if self.history:
+                prev = self.history.pop()
+                self.cur = prev[0]
+                self.cur_index = prev[1]
+                self.show_content(self.cur, self.cur_index)
+        elif key == "Right":
+            index2 = self.cur_index + 20
+            index2 = min(index2, self.listbox.index(END) - 1)
+            self.set_list_item(index2)
+
+        elif key == "Left":
+            index2 = self.cur_index - 20
+            index2 = max(index2, 0)
+            self.set_list_item(index2)
+
+    def set_list_item(self, index):
+        self.cur_index = index
+        self.listbox.selection_clear(0, END)
+        self.listbox.selection_set(index)
+        self.listbox.activate(index)
+        self.listbox.focus_set()
+        self.update()
+
+
+    def show_content(self, cur2, cur_index=0):
+        data = cur2[1]
+        self.txt1.config(text=cur2[0])
+        self.content = self.sources.get_content(data)
+        self.listbox.delete(0, END)
+        for item in self.content:
+            self.listbox.insert(END, item[0])
+        self.listbox.selection_set(cur_index)
+        self.listbox.activate(cur_index)
+        self.listbox.focus_set()
+        self.show_desc()
+        self.show_pic()
+
+    def show_desc(self):
+        cs = self.listbox.curselection()[0]
+        self.txt2.config(text=self.content[cs][0])
+        self.desc.config(state=NORMAL)
+        self.desc.delete("1.0", END)
+        self.desc.insert(END, self.content[cs][3])
+        self.desc.insert(END, "\n\n"+self.content[cs][2])
+        self.desc.config(state=DISABLED)
+
+    def show_pic(self):
+        cs = self.listbox.curselection()[0]
+        img = self.content[cs][2]
+        self.pic.delete(ALL)
+        if not img.startswith("http"):
+            img_path = os.path.join(self.picons_path, img)
+            if img and os.path.exists(img_path):
+                im =  Image.open(img_path)
+            else:
+                im = None
+        elif img:
+            fcache = img.replace(":", "_").replace("/", "-").replace(":", "_")
+            fcache = os.path.join(self.tmp_path, fcache)
+            if os.path.exists(fcache):
+                im =  Image.open(fcache)
+            else:
+                r = requests.get(img)
+                if r.status_code == 200:
+                    img_data = r.content
+                    im = Image.open(StringIO.StringIO(r.content))
+                    with open(fcache, "wb") as f:
+                        f.write(r.content)
+                else:
+                    im = None
+        if im:
+            im.thumbnail((400, 250))
+            image = ImageTk.PhotoImage(im)
+            imagesprite = self.pic.create_image(200, 125,image=image)
+            self.pic.image = image
+
+    def play_video(self, cur2):
+        if self.sources.stream_type(cur2[1]):
+            stream = util.item()
+            stream["url"] = cur2[1]
+            stream["name"] = cur2[0]
+            streams = [stream]
+        else:
+            try:
+                streams = self.sources.get_streams(cur2[1])
+            except Exception as e:
+                print unicode(e)
+                traceback.print_exc()
+                tkm.showerror("Error getting streams", unicode(e))
+                return
+            if not streams:
+                tkm.showerror("Error getting streams", "No streams found")
+                return
+            if len(streams) > 1:
+                lst = []
+                for i,s in enumerate(streams):
+                    lst.append(("[%s,%s] %s"%(s["lang"],s["quality"],s["name"]),i))
+                a = ChoiceBox("ChoiceBox test", "Select stream", lst, parent=self, width=40).result
+                stream = streams[a]
+            else:
+                stream = streams[0]
+            stream = util.stream_change(stream)
+            title = stream["name"] if not "nfo" in stream or not stream["nfo"] else util.nfo2title(stream["nfo"])
+            desc = stream["desc"] if not "nfo" in stream or not stream["nfo"] else util.nfo2desc(stream["nfo"])
+            img = stream["img"]
+            url = stream["url"]
+            suburl = ""
+            print url
+            if "subs" in stream and stream["subs"]:
+                suburl = stream["subs"][0]["url"]
+                print "\n**Download subtitles %s - %s"%(title,suburl)
+                subs = urllib2.urlopen(suburl).read()
+                if subs:
+                    fname0 = re.sub("[/\n\r\t,:\?]","_",title)
+                    subext = ".srt"
+                    subfile = os.path.join(self.tmp_path,fname0+subext)
+                    if ".xml" in suburl:
+                        subs = util.ttaf2srt(subs)
+                    with open(subfile,"w") as f:
+                        f.write(subs)
+                else:
+                    print "\n Error downloading subtitle %s"%suburl
+            print "\n**Play stream %s\n%s" % (title, url.encode("utf8"))
+            player(url,title,suburl,stream["headers"])
+
+
+
+    def start(self):
+        self.root.mainloop()
+
+
+class ChoiceBox(tkd.Dialog):
+    #a = ChoiceBox("ChoiceBox test", "Select stream", items, parent=self).result
+    def __init__(self, title, prompt, items, width=20, height=15,
+                 initialvalue=0, parent = None):
+        if not parent:
+            import Tkinter
+            parent = Tkinter._default_root
+        self.prompt = prompt
+        self.items = items
+        self.width = width
+        self.height = height
+        self.result = None
+        self.initialvalue = initialvalue
+        tkd.Dialog.__init__(self, parent, title)
+
+    def body(self, master):
+        w = Label(self, text=self.prompt, justify=LEFT)
+        w.pack(side=TOP)
+        frame1 = Frame(self)
+        frame1.pack(side=TOP, fill=X, expand=1, padx=5)
+        scrollbar = Scrollbar(frame1, orient=VERTICAL)
+        self.listbox = Listbox(frame1, yscrollcommand=scrollbar.set, width=self.width, height=self.height)
+        scrollbar.config(command=self.listbox.yview)
+        #self.listbox.config(yscrollcommand=scrollbar.set)
+        self.listbox.pack(side=LEFT, fill=BOTH, expand=1)
+        scrollbar.pack(side=LEFT, fill=Y)
+        for item in self.items:
+            self.listbox.insert(END, item)
+        self.listbox.selection_set(self.initialvalue)
+        self.listbox.activate(self.initialvalue)
+        self.listbox.bind('<Double-1> ', self.list_select)
+        self.listbox.bind('<Key> ', self.list_key)
+        self.update()
+        self.geometry("+%d+%d"%(self.parent.winfo_rootx()+100, self.parent.winfo_rooty()+100 ))
+        return self.listbox
+
+    def list_key(self, evt):
+        key = evt.keysym
+        #print 'Key %s' % (key)
+        if key == "Return":
+            self.ok()
+        elif key == "Escape":
+            self.cancel()
+
+    def list_select(self, evt):
+        self.ok()
+
+    def apply(self):
+        self.result = self.listbox.curselection()[0]
+
+
+def run(sources=None, data="config::home", title="Home"):
+    app = Main(sources)
+    app.show_content((title, data, "", ""))
+    app.start()
+
+
+
+def run_cli(sources, data="config::home"):
+
+    #options = sources.options_read("ltc")
+    #print options
+    history = []
+    cur = ("Home",data,None,None)
+    content = sources.get_content(cur[1])
+
+    exit_loop = False
+    while True:
+        print
+        for i,item in enumerate(content):
+            s = "%i: %s - %s %s"%(i,item[0],item[1],item[2])
+            print s #.encode(sys.stdout.encoding,"replace")
+
+        while True:
+            a = raw_input("Enter number, (-) for download, q for exit: ")
+            if a in ("q","Q","x","X"):
+                exit_loop = True
+                print "Exiting"
+                break
+            try:
+                n = int(a)
+                break
+            except:
+                print "Not number!"
+        if exit_loop: break
+        download = False
+        if n<0:
+            n = abs(n)
+            download = True
+        cur2 = content[n]
+        data0 = cur2[1].split("::")[1] if "::" in cur2[1] else cur2[1]
+        if not data0:
+            pass
+        elif cur2[1] == "back":
+            cur = history.pop()
+        elif sources.is_video(cur2[1]):
+            if sources.stream_type(cur2[1]):
+                stream = util.item()
+                stream["url"] = cur2[1]
+                stream["name"] = cur2[0]
+                streams = [stream]
+            else:
+                try:
+                    if not download:
+                        streams = sources.get_streams(cur2[1])
+                    else:
+                        stream = util.item()
+                        stream["url"] = cur2[1]
+                        stream["name"] = cur2[0]
+                        stream["url"] = util.streamproxy_encode2(stream["url"])
+                        print stream["url"]
+                        streams = [stream]
+                except Exception as e:
+                    print unicode(e)
+                    traceback.print_exc()
+                    streams = []
+            if streams:
+                if not download:
+                    play_video(streams)
+                else:
+                    #urlp = util.streamproxy_encode2(streams[0]["url"])
+                    #print urlp
+                    #util.player(urlp)
+                    #Downloader.download_video(streams)
+                    pass
+            else:
+                print "**No stream to play - %s "%(
+                    cur2[1])
+                raw_input("Press any key")
+            #import os
+            #os.system('"c:\Program Files (x86)\VideoLAN\VLC\vlc.exe" "%s"'%cur2[1])
+
+        else:
+            if "{0}" in cur2[1]:
+                a = raw_input("Enter value:")
+                cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])
+            history.append(cur)
+            cur = cur2
+        try:
+            content = sources.get_content(cur[1])
+        except Exception as e:
+            print unicode(e)
+            traceback.print_exc()
+            raw_input("Continue?")
+
+def play_video(streams, select=False):
+    if len(streams)>1 and select:
+        for i,s in enumerate(streams):
+
+            print "%s: [%s,%s,%s] %s"%(i,s["quality"],s["lang"],s["type"],s["name"])
+        a = raw_input("Select stram to play: ")
+        try:
+            n = int(a)
+        except:
+            n = 0
+        if n>=len(streams):
+            stream = streams[-1]
+        else:
+            stream = streams[n]
+    else:
+        stream = streams[0]
+
+    stream = util.stream_change(stream)
+    title = stream["name"] if not "nfo" in stream or not stream["nfo"] else util.nfo2title(stream["nfo"])
+    desc = stream["desc"] if not "nfo" in stream or not stream["nfo"] else util.nfo2desc(stream["nfo"])
+    img = stream["img"]
+    url = stream["url"]
+    suburl = ""
+    print url
+    if "subs" in stream and stream["subs"]:
+        suburl = stream["subs"][0]["url"]
+        print "\n**Download subtitles %s - %s"%(title,suburl)
+        subs = urllib2.urlopen(suburl).read()
+        if subs:
+            fname0 = re.sub("[/\n\r\t,:\?]","_",title)
+            subext = ".srt"
+            subfile = os.path.join("",fname0+subext)
+            if ".xml" in suburl:
+                subs = ttaf2srt(subs)
+            with open(subfile,"w") as f:
+                f.write(subs)
+        else:
+            print "\n Error downloading subtitle %s"%suburl
+    print "\n**Play stream %s\n%s" % (title, url.encode("utf8"))
+    return player(url,title,suburl,stream["headers"])
+
+def player(url, title = "", suburl= "",headers={}):
+    from subprocess import call
+    cmd1 = [r"c:\Program Files\VideoLAN\VLC\vlc.exe",url,
+           "--meta-title",title.decode("utf8").encode(sys.getfilesystemencoding()),
+           "--http-user-agent","Enigma2"
+    ]
+    # gst-launch-1.0 -v souphttpsrc ssl-strict=false proxy=127.0.0.1:8888 extra-headers="Origin:adadadasd"  location="http://bitdash-a.akamaihd.net/content/sintel/sintel.mpd" ! decodebin! autovideosink
+    cmd2 = [
+        r"C:\gstreamer\1.0\x86_64\bin\gst-launch-1.0","-v",
+        "playbin", 'uri="%s"'%url,
+        #"souphttpsrc", "ssl-strict=false",
+        #"proxy=127.0.0.1:8888",
+        #'location="%s"'%url,
+        #'!decodebin!autovideosink'
+    ]
+    cmd3 = ["ffplay.exe",url]
+    cmd = cmd3 if url.startswith("https") else cmd2
+    ret = call(cmd)
+    #if ret:
+        #a = raw_input("*** Error, continue")
+    return
+
+
+if __name__ == "__main__":
+    show_hidden = False
+    if len(sys.argv)>1:
+        data= sys.argv[1]
+    else:
+        data = "config::home"
+    #sources = ContentSources("sources")
+    sources = None
+    run(sources, data)

sources/SourceBase.py

@@ -54,7 +54,7 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
 
     def get_content(self,data):
         ### To be overriden in child class
-        return [("..atpakaļ","back",None,"Kļūda, atgriezties atpakaļ")]
+        return [("..atpakaļ","back","back.png","Kļūda, atgriezties atpakaļ")]
 
     def is_video(self,data):
         ### To be overriden in child class

sources/cinemalive.py

@@ -55,7 +55,7 @@ Accept-Language: en-US,en;q=0.8
         print "[cinemalive] get_content:", data
         source,data,path,plist,clist,params,qs = self.parse_data(data)
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -191,15 +191,15 @@ Accept-Language: en-US,en;q=0.8
 
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
+
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()
+
+
     #cat = api.get_categories(country)
     #chan = api.get_channels("lv")
     #prog = api.get_programs(channel=6400)

sources/config.py

@@ -98,18 +98,22 @@ class Source(SourceBase):
 
 
 if __name__ == "__main__":
-    c = Source()
-    content = c.get_content("home")
-    for item in content: print item
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()
+
     #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.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","back.png","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
+    #c.write_streams()
+    #for item in content: print item
 

sources/euronews.py

@@ -61,7 +61,7 @@ Connection: keep-alive
             raise Exception("Not valid default language - '%s'"%lang)
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -127,7 +127,7 @@ Connection: keep-alive
                     ptitle = article["pTitle"] if "pTitle" in article else ""
                     id = article["id"]
                     desc = "%s\n%s\n%s %s"%(title,atime,vert,ptitle)
-                    img = "http://static.euronews.com/articles/%s/399x225_%s..png"%(id,id)
+                    img = "http://static.euronews.com/articles/%s/399x225_%s.png"%(id,id)
                     if not atype in ("breakingnews","wire"):
                         data2 = "content/getArticle?lang=%s&id=%s"%(lang,id)
                     else:
@@ -293,13 +293,13 @@ content-disposition: form-data; name=request
 if __name__ == "__main__":
     language= "en"
     c = Source(language)
-    data = '{"methodName":"content.getTimeline","apiKey":"androidPhoneEuronews-1.0","params":{"page":"1","byPage":"30"},"language":"en"}'
-    r = c.call(data)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source(language)
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()
+
+    #c = Source(language)
+    #data = '{"methodName":"content.getTimeline","apiKey":"androidPhoneEuronews-1.0","params":{"page":"1","byPage":"30"},"language":"en"}'
+    #r = c.call(data)

sources/filmas.py

@@ -61,7 +61,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         print "[filmas] get_content:", data
         source, data, path, plist, clist, params, qs = self.parse_data(data)
         content = []
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -70,7 +70,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                 ("Spēlfilmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=112","","Visur skatamās spēlfilmas"),
                 ("Animācijas filmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=113","","Visur skatamās animācijas filmas"),
                 ("Dokumentalās filmas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=111","","Visur skatamās dokumentalās filmas"),
-                 ("Kinohronikas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=150","","Visur skatamās kinohronikas")    ,
+                ("Kinohronikas", "filmas::filmu-katalogs/?tab=movies&sub_tab=movies-view-2&mp20=150","","Visur skatamās kinohronikas")    ,
             ])
             return content
 
@@ -229,8 +229,10 @@ if __name__ == "__main__":
         #for s in streams:
         s = streams[0]
         download_hls(s["url"],"%s %s"%(s["name"],s["quality"]),"",s["headers"])
-    else:
-        content  = c.get_content(data)
-        for item in content:
-            print item
-    pass
+        sys.exit()
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/filmix.py

@@ -58,7 +58,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         print "[filmix] get_content:", data
         source, data, path, plist, clist, params, qs = self.parse_data(data)
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -388,25 +388,9 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 
 if __name__ == "__main__":
 
-    c = Source()
-    #s = "ZnVuY3Rpb24gc2VuZE1lc3NhZ2U2MDc3ODkoZSl7dmFyIGg9bWdfd3M2MDc3ODkub25tZXNzYWdlOyBtZ193czYwNzc4OS5yZWFkeVN0YXRlPT1tZ193czYwNzc4OS5DTE9TRUQmJihtZ193czYwNzc4OT1uZXcgV2ViU29ja2V0KG1nX3dzNjA3Nzg5X2xvY2F0aW9uKSksbWdfd3M2MDc3ODkub25tZXNzYWdlPWgsd2FpdEZvclNvY2tldENvbm5lY3Rpb242MDc3ODkobWdfd3M2MDc3ODksZnVuY3Rpb24oKXttZ193czYwNzc4OS5zZW5kKGUpfSl9ZnVuY3Rpb24gd2FpdEZvclNvY2tldENvbm5lY3Rpb242MDc3ODkoZSx0KXtzZXRUaW1lb3V0KGZ1bmN0aW9uKCl7cmV0dXJuIDE9PT1lLnJlYWR5U3RhdGU/dm9pZChudWxsIT10JiZ0KCkpOnZvaWQgd2FpdEZvclNvY2tldENvbm5lY3Rpb242MDc3ODkoZSx0KX0sNSl9OyB2YXIgbWdfd3M2MDc3ODlfbG9jYXRpb24gPSAid3NzOi8vd3NwLm1hcmtldGdpZC5jb20vd3MiOyBtZ193czYwNzc4OSA9IG5ldyBXZWJTb2NrZXQobWdfd3M2MDc3ODlfbG9jYXRpb24pLCBtZ193czYwNzc4OS5vbm1lc3NhZ2UgPSBmdW5jdGlvbiAodCkge3Bvc3RNZXNzYWdlKHQuZGF0YSk7fSwgb25tZXNzYWdlID0gZnVuY3Rpb24oZSl7c2VuZE1lc3NhZ2U2MDc3ODkoZS5kYXRhKX0="
-
-    #txt = c.decode_uppod_text(s)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/filmon.py

@@ -63,7 +63,7 @@ class Source(SourceBase):
         #    self.session_key = js["session_key"]
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -254,23 +254,9 @@ Connection: keep-alive
         return js
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/iplayer.py

@@ -77,7 +77,7 @@ Connection: Keep-Alive
         #lang = qs["lang"] if "lang" in qs else self.country
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         ### Home ###
         if data=="home":
@@ -519,41 +519,9 @@ def gt(dt_str):
     return dt
 
 if __name__ == "__main__":
-    c = Source()
-    from subprocess import call
-    #ch = c.get_channels()
-    #c.get_epg_live("bbc_two_england")
-
-    if len(sys.argv)>1 and  not "iplayer::" in sys.argv[1]:
-
-        vid = sys.argv[1]
-        print "login - %s"%c.login("ivars777","xxx")
-        vid = "1069"
-        vid = "1462566072086"
-        channelid="101"
-        vid = "1350462656767"
-        #data = c.get_stream_url(vid,"vod")
-        #call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",data["stream"]])
-        pass
-
-
-
-    else:
-        if len(sys.argv)>1:
-            data= sys.argv[1]
-        else:
-            data = "iplayer::home"
-        content = c.get_content(data)
-        for item in content:
-            print item
-        #cat = api.get_categories(country)
-        #chan = api.get_channels("lv")
-        #prog = api.get_programs(channel=6400)
-        #prog = api.get_programs(category=55)
-        #seas = api.get_seasons(program=6453)
-        #str = api.get_streams(660243)
-        #res = api.get_videos(802)
-        #formats = api.getAllFormats()
-        #det = api.detailed("1516")
-        #vid = api.getVideos("13170")
-        pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/lmt.py

@@ -54,7 +54,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         print "[lmt] get_content:", data
         source, data, path, plist, clist, params, qs = self.parse_data(data)
         content = []
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -197,23 +197,9 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/ltc.py

@@ -78,7 +78,7 @@ Accept-Language: en-US,en;q=0.8
         source, data, path, plist, clist, params, qs = self.parse_data(data)
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -336,15 +336,15 @@ Accept-Language: en-US,en;q=0.8
 
             # Ir sezonas
             if m:
-                result = re.findall(r"""season_choice\('[^']*','[^']*','(\d+)','epizode','([^']*)','','(\d+)',0,0\)">([^<]+)<""", r)
+                result = re.findall(r"""season_choice\(.+?'epizode','([^']*)',[^,]+,'(\d+)',[^,]+,[^,]+\)">([^<]+)<""", r, re.MULTILINE)
                 if not result:
                     raise Exception("No seasons find!")
-                vid = result[0][1]
+                vid = result[0][0]
 
                 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])
+                        title = "%s - %s" % (raidijums, it[2])
+                        data2 = path+"?season_nr=%s"%(it[1])
                         img = img0
                         desc = title
                         content.append((title, self.name + "::" + data2, img, desc))
@@ -354,6 +354,8 @@ Accept-Language: en-US,en;q=0.8
                     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
+                    # https://www.lattelecom.tv/api/episode-loader-design17/3?chunk_size=4&sorting=epizode&series_id=dora_the_explorer&movie_id=10161&z360tv=&is_active_season=false HTTP/1.1
+                    # https://www.lattelecom.tv/api/episode-loader-design17/3?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:
@@ -1039,11 +1041,15 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
             return False
 
 if __name__ == "__main__":
-    c = Source()
-    from subprocess import call
-    c.get_info2(sys.argv[1])
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
     sys.exit()
 
+    c.get_info2(sys.argv[1])
+
     if len(sys.argv)>1 and  not "ltc::" in sys.argv[1]:
 
         vid = vid2 = sys.argv[1]

sources/movieplace.py

@@ -56,7 +56,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         print "[movieplace] get_content:", data
         source, data, path, plist, clist, params, qs = self.parse_data(data)
         content = []
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -213,23 +213,9 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         return streams
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/mtgplay.py

@@ -63,7 +63,7 @@ class Source(SourceBase):
             self.country = qs["country"] if "country" in qs else "lv"
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -261,23 +261,9 @@ class Source(SourceBase):
             return content
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/play24.py

@@ -46,7 +46,7 @@ class Source(SourceBase):
         lang = qs["lang"] if "lang" in qs else self.country
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -193,23 +193,9 @@ class Source(SourceBase):
         return content
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/replay.py

@@ -50,7 +50,7 @@ class Source(SourceBase):
         lang = qs["lang"] if "lang" in qs else self.country
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -288,23 +288,9 @@ Referer: http://replay.lsm.lv/lv/ieraksts/ltv/70398/tiesa-runa.-lielbritanija-ga
 
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/serialguru.py

@@ -59,7 +59,7 @@ Referer: http://serialguru.ru/
         lang = qs["lang"] if "lang" in qs else self.country
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -213,23 +213,9 @@ Referer: http://serialguru.ru/
         return content
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/streams.cfg

@@ -4,7 +4,6 @@ My TV|config::my_tv|my_tv.png|Mani TV kanāli (tiešraide)
 My TV archive|config::my_archive|my_archive.png|Mani TV arhīvu video
 My Video|config::my_video|my_video.png|Mani video
 My Kids|config::my_kids|my_kids.png|Mani bērnu video
-#My Radio|config::my_radio|my_radio.png|Mani radio kanāli
 Replay.lv (LTV)|replay::home|replay.png|Latvijas TV tiešraides un arhīvs
 Skaties.lv (TV3)|mtgplay::home|skaties.png|MTG kanālu (LNT,TV3, TV6 u.c.) arhīvs
 Shortcut (lattelecom.tv)|ltc::home|shortcut.png|lattelecom TV, arhīves un video
@@ -25,19 +24,21 @@ TVPlay Baltic|config::mtg|tvplay.png|Other countries MTG media portals content
 
 [my_tv]
 My Tv
-..return|back|default|Atgriezties atpakaļ
+..return|back|back.png|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 )
-TV3 (ltc)|ltc::content/live-streams/103?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/TV3_logo.png|TV3
-LNT (ltc)|ltc::content/live-streams/104?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/LNT_logo.png|LNT
-TV6|ltc::content/live-streams/106?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/TV6_logo.png|TV6
-Kanāls 2|ltc::content/live-streams/608?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/Kanals2_logo.png|Kanāls 2
-3+|ltc::content/live-streams/107?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/3_logo.png|3+
+TVRiga24|play24::tiesraide|riga24.png|TVRiga24 live stream
+TVPlay Live|mtgplay::videos?country=lv&order=title&type=live|skaties.png|Skaties.lv live streams(not always available)
+LNT|ltc::content/live-streams/104?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_back.png/LNT_logo.png|LNT tiešraide (ltc)
+TV3|ltc::content/live-streams/103?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_back.png/TV3_logo.png|TV3 tiešraide (ltc)
+TV6 |ltc::content/live-streams/106?include=quality| https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/TV6_logo.png|TV6 tiešraide (ltc)
+3+|ltc::content/live-streams/107?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/3_logo.png|3+ tiešraide (ltc)
+Kanāls 2|ltc::content/live-streams/608?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/Kanals2_logo.png|Kanāls 2 tiešraide (ltc)
 360TV|ltc::content/live-streams/1051?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/360TV_new.png|360TV
-STV Pirmā!|ltc::content/live-streams/1069?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/STV.png|STV Pirmā!
-TVRiga24|play24::tiesraide|riga.24.png|TV live streams
-Re:TV|ltc::content/live-streams/924?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/RE_TV.png|Re:TV
-RU live|tvdom::tiesraides|tvdom.png|RU live streams from TVDom
+STV Pirmā!|ltc::content/live-streams/1069?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/STV.png|STV Pirmā! tiešraide (ltc)
+Re:TV|ltc::content/live-streams/924?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/RE_TV.png|Re:TV tiešraide (ltc)
+Euronews|euronews::live?lang=en|euronews.png|Euronews live stream
+TVDom live|tvdom::tiesraides|tvdom.png|RU live streams from TVDom
 BBC live (iPlayer)|iplayer::live|iplayer.png|BBC live streams from iPlayer
 UK live (FilmOn) TV|filmon::group?id=5|https://static.filmon.com/assets/groups/5/big_logo.png|UK live streams from FilmOn
 US live (USTVNow|ustvnow::tvlive|ustvnow.png|US live streams from FilmOn
@@ -54,18 +55,18 @@ Lattelecom.tv arhīvs - categories|ltc::archive/categories|shortcut.png|Lattelec
 TVRiga24 arhīvs|play24::kategorija/raidijumi|riga24.png|TVRiga24.tv pārraižu arhīvs
 TVDom arhīvs - categories|tvdom::arhivs|tvdom.png|TVDom(PBK, NTV, REN u.c.) pārraižu arhīvs RU
 BBC (iPlayer) arhīvs|iplayer::categories|iplayer.png|BBC programmes by categories
-Category - News|euronews::content/getVertical?lang=en&byPage=40&page=1&vId=1|euronews.png|Category - News
-Latest programs|euronews::content/getLatestPrograms?lang=en&byPage=40&page=1|euronews.png|Latest programs
+Euronews latest|euronews::content/getLatestPrograms?lang=en&byPage=40&page=1|euronews.png|Latest programs
+Euronews Categories|euronews::content/getVertical?lang=en&byPage=40&page=1&vId=1|euronews.png|Category - News
 
 [my_video]
 My Video
 ..return|back||Atgriezties atpakaļ
-Все фильмы|filmix::films|filmix.png|Все фильмы
-Все сериалы|filmix::serialy|filmix.png|Все сериалы
+Filmix - Все фильмы|filmix::films|filmix.png|Все фильмы
+Filmix - Все сериалы|filmix::serialy|filmix.png|Все сериалы
 
 [my_kids]
 My Kids
-..return|back|default|Atgriezties atpakaļ
+..return|back|back.png|Atgriezties atpakaļ
 Bērnu TV|config::my_kids_tv|my_tv.png|Bērnu TV kanāli
 Bērnu video|config::my_kids_video|my_video.png|Saglabātie bērnu video
 LTV bērnu TV arhīvs|replay::raidijumi/?lang=lv&type=video&theme=5|my_archive.png|LTV bērnu TV arhīvs
@@ -79,7 +80,7 @@ Filmix bērnu seriāli|filmix::detskij/s7|filmix.png|Filmix bērnu seriāli
 
 [my_kids_tv]
 My Kids TV
-..return|back|default|Atgriezties atpakaļ
+..return|back|back.png|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
 Jim Jam|ltc::content/live-streams/303?include=quality|https://manstv.lattelecom.tv/images/01_Bildes/02_Kanalu_raidijumu_default/Jim_Jam.png|Jim Jam
@@ -92,11 +93,11 @@ Om Nom (FilmOn)|filmon::channel?id=3824|http://static.filmon.com/assets/channels
 
 [my_kids_video]
 My Kids Video
-..return|back|default|Atgriezties atpakaļ
+..return|back|back.png|Atgriezties atpakaļ
 
 [my_radio]
 My Radio
-..return|back|default|Atgriezties atpakaļ
+..return|back|back.png|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)
 LR3|replay::tiesraide/lr3/|http://replay.lsm.lv/resources/logo/lr3_logo.png|LR3 tiesraide (audio)
@@ -106,7 +107,7 @@ LR6|replay::tiesraide/lr6/|http://replay.lsm.lv/resources/logo/lr6_logo.png|LR6
 
 [mtg]
 MTG
-..return|back|default|Atgriezties atpakaļ
+..return|back|back.png|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
 Sweden (tvXplay.se)|mtgplay::home?country=se||MTG Sweden media portal content

sources/tvdom.py

@@ -88,7 +88,7 @@ Referer: https://tvdom.tv/
         lang = self.options["lang"]
         region = self.options["region"]
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -293,6 +293,8 @@ Referer: https://tvdom.tv/
             if m:
                 data2 = m.group(1)
             else:
+                if "no_player_body" in r:
+                    raise Exception("Lai skatītos maksas kanālus, nepieciešams iegādāties abonementu")
                 raise Exception("No stream found")
             m = re.search('title: "([^"]+)"', r, re.DOTALL)
             title = m.group(1) if m else data2
@@ -323,23 +325,9 @@ Referer: https://tvdom.tv/
 
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/ustvnow.py

@@ -80,7 +80,7 @@ class Source(SourceBase):
         lang = qs["lang"] if "lang" in qs else self.country
 
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -171,23 +171,9 @@ Referer: http://watch.ustvnow.com/guide
 
 
 if __name__ == "__main__":
-    country= "lv"
-    c = Source(country)
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "home"
-    content = c.get_content(data)
-    for item in content:
-        print item
-    #cat = api.get_categories(country)
-    #chan = api.get_channels("lv")
-    #prog = api.get_programs(channel=6400)
-    #prog = api.get_programs(category=55)
-    #seas = api.get_seasons(program=6453)
-    #str = api.get_streams(660243)
-    #res = api.get_videos(802)
-    #formats = api.getAllFormats()
-    #det = api.detailed("1516")
-    #vid = api.getVideos("13170")
-    pass
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()

sources/viaplay.py

@@ -187,7 +187,7 @@ Referer: https://viaplay.lv/
         print "[%s] get_content:"%self.name, data
         source,data,path,plist,clist,params,qs = self.parse_data(data)
         content=[]
-        content.append(("..return", "back","","Return back"))
+        content.append(("..return", "back","back.png","Return back"))
 
         if clist=="home":
             content.extend([
@@ -452,23 +452,11 @@ Referer: https://viaplay.lv/
         return content
 
 if __name__ == "__main__":
-    if len(sys.argv)>1:
-        data= sys.argv[1]
-    else:
-        data = "kids/child-and-karlson"
-    c = Source()
-    print "login: %s"%c.login()
-    if "/" in data:
-        streams = c.get_streams(data)
-        util.play_video(streams)
-    else:
-        vinfo = c.get_video_info(data)
-        if "HLS" in vinfo["tracks"] and vinfo["tracks"]["HLS"]:
-            url = vinfo["tracks"]["HLS"][0]["src"]
-            urlp = util.streamproxy_encode(url)
-            util.player(urlp)
-        else:
-            print "No HLS stream"
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
     sys.exit()
 
     r = requests.get("https://viaplay.lv/movies?sections[]=MOVIES")

util.py

@@ -116,69 +116,6 @@ def nfo2title(nfo):
         title += " (%s)"%nfo["year"]
     return title.encode("utf8") if isinstance(title,unicode) else title
 
-def play_video(streams):
-    if len(streams)>1:
-        for i,s in enumerate(streams):
-
-            print "%s: [%s,%s,%s] %s"%(i,s["quality"],s["lang"],s["type"],s["name"])
-        a = raw_input("Select stram to play: ")
-        try:
-            n = int(a)
-        except:
-            n = 0
-        if n>=len(streams):
-            stream = streams[-1]
-        else:
-            stream = streams[n]
-    else:
-        stream = streams[0]
-
-    stream = stream_change(stream)
-    title = stream["name"] if not "nfo" in stream or not stream["nfo"] else nfo2title(stream["nfo"])
-    desc = stream["desc"] if not "nfo" in stream or not stream["nfo"] else nfo2desc(stream["nfo"])
-    img = stream["img"]
-    url = stream["url"]
-    suburl = ""
-    print url
-    if "subs" in stream and stream["subs"]:
-        suburl = stream["subs"][0]["url"]
-        print "\n**Download subtitles %s - %s"%(title,suburl)
-        subs = urllib2.urlopen(suburl).read()
-        if subs:
-            fname0 = re.sub("[/\n\r\t,:\?]","_",title)
-            subext = ".srt"
-            subfile = os.path.join("",fname0+subext)
-            if ".xml" in suburl:
-                subs = ttaf2srt(subs)
-            with open(subfile,"w") as f:
-                f.write(subs)
-        else:
-            print "\n Error downloading subtitle %s"%suburl
-    print "\n**Play stream %s\n%s" % (title, url.encode("utf8"))
-    return player(url,title,suburl,stream["headers"])
-
-def player(url, title = "", suburl= "",headers={}):
-    from subprocess import call
-    cmd1 = [r"c:\Program Files\VideoLAN\VLC\vlc.exe",url,
-           "--meta-title",title.decode("utf8").encode(sys.getfilesystemencoding()),
-           "--http-user-agent","Enigma2"
-    ]
-    # gst-launch-1.0 -v souphttpsrc ssl-strict=false proxy=127.0.0.1:8888 extra-headers="Origin:adadadasd"  location="http://bitdash-a.akamaihd.net/content/sintel/sintel.mpd" ! decodebin! autovideosink
-    cmd2 = [
-        r"C:\gstreamer\1.0\x86_64\bin\gst-launch-1.0","-v",
-        "playbin", 'uri="%s"'%url,
-        #"souphttpsrc", "ssl-strict=false",
-        #"proxy=127.0.0.1:8888",
-        #'location="%s"'%url,
-        #'!decodebin!autovideosink'
-    ]
-    cmd3 = ["ffplay.exe",url]
-    cmd = cmd3 if url.startswith("https") else cmd2
-    ret = call(cmd)
-    #if ret:
-        #a = raw_input("*** Error, continue")
-    return
-
 def stream_type(data):
     data = data.lower()
     m = re.search(r"^(\w+)://", data)