0.5p

PlayStream.py

@@ -65,11 +65,13 @@ def make_service(stream):
     url = url.encode("utf8")
     if "|" in url:
         url = url.replace("|","#")
-    #url = url.replace(":","%3a")
+    service_type = 4097
     if re.search("\.ts$",url.split("?")[0],re.IGNORECASE):
         service_type = 1
-    else:
-        service_type = 4097
+    if "resolver" in stream and stream["resolver"] in ("hqq","viaplay"):
+        url = util.streamproxy_encode(stream["url"], stream["headers"])
+        if os.path.exists("/usr/bin/exteplayer3"): # problem playing hqq streams with gstreamer, use exteplayer3
+            service_type = 5002
     print "service_type=",service_type
     print "stream_url=",url
     service = eServiceReference(service_type, 0, url)
@@ -91,8 +93,8 @@ class PSSubs(Screen):
              </screen>""" % (offset, desktopHeight-offset-140, screenWidth, screenWidth)
         self['subtitle'] = Label()
         Screen.__init__(self, session)
-        
- 
+
+
 #####################################################################################################################
 class PSPlayer(MoviePlayer):
     def __init__(self, session, streams):
@@ -103,24 +105,24 @@ class PSPlayer(MoviePlayer):
         self.selected = 0
         self.resume_pos = 0
         service = make_service(self.cur_stream)
-        
+
         MoviePlayer.__init__(self, session, service)
-        self.skinName = "MoviePlayer"        
+        self.skinName = "MoviePlayer"
         self["actions"] = ActionMap(["MediaPlayerActions","MediaPlayerSeekActions","MoviePlayerActions","InfobarSeekActions","MovieSelectionActions","ColorActions"], {
             "stop":self.leavePlayer,
             "leavePlayer":self.leavePlayer,
-            
+
             "audio":self.select_stream,
             "AudioSelection":self.select_stream,
             "green":self.select_stream,
-            
+
             "subtitles":self.select_captions,
             "text":self.select_captions,
             "yellow_key":self.select_captions,
             "yellow":self.select_captions,
             "pauseServiceYellow":self.select_captions,
             "pause":self.select_captions,
-            
+
             "showEventInfo":self.service_info,
             "info":self.service_info
         })
@@ -141,16 +143,16 @@ class PSPlayer(MoviePlayer):
         else:
             self.subs = []
             self.cur_subs = 0
-            self.svisible = False 
+            self.svisible = False
         self.subtitle_window = self.session.instantiateDialog (PSSubs)
         self.onLayoutFinish.append(self.start_subtitles_timer)
-        
+
     def start_subtitles_timer(self):
         if self.stimer:
             self.subtitle_window.show()
             print "start_subtitles_timer"
             self.stimer.start(self.stimer_step)
-        
+
     def get_sub_pts(self,pts):
         sc = self.get_sub_ind(self.sind) # current subbtitle
         while True:
@@ -166,14 +168,14 @@ class PSPlayer(MoviePlayer):
                 else:
                     txt = sc["text"] if sc["text"] else " "
                     return txt
-            
+
     def get_sub_ind(self,ind):
         subs_object = self.get_subs_current() # current subs object
         if subs_object:
             return subs_object.subs[ind] if ind<len(subs_object.subs) else None
         else:
             return None
-            
+
     def get_subs_current(self):
         "Return current sub_object"
         if not "subs" in self.subs[self.cur_subs]:
@@ -187,7 +189,7 @@ class PSPlayer(MoviePlayer):
                 return subs_object
         else:
             return self.subs[self.cur_subs]["subs"]
-        
+
     def update_subtitles(self):
         if not self.shown and self.svisible:
             seek = self.getSeek()
@@ -209,8 +211,8 @@ class PSPlayer(MoviePlayer):
         elif not self.svisible:
             if self.subtitle_window.shown:
                 self.subtitle_window.hide()
-            
-        
+
+
         # 	struct SubtitleTrack
         #	int type;
         #	int pid;
@@ -219,21 +221,21 @@ class PSPlayer(MoviePlayer):
         #	std::string language_code;
         #selectedSubtitle = ???
         #self.enableSubtitle(selectedSubtitle)
-        
+
     def start_subtitles_timer(self):
         self.stimer.start(self.stimer_step)
-       
+
     def play_service(self,service):
         self.movieSelected(service)
-       
+
     #def doShow(self):
         #self.svisible = False
         #InfoBarShowHide.doShow(self)
-        
+
     #def doHide(self):
         #self.svisible = True
         #InfoBarShowHide.doHide(self)
-    
+
     def service_info(self):
         print "########[MoviePlayer] service_info"
         text = "%s\n%s %s\n%s"%(self.cur_stream["name"],self.cur_stream["lang"],self.cur_stream["quality"],self.cur_stream["desc"])
@@ -241,19 +243,19 @@ class PSPlayer(MoviePlayer):
         #print text
         mtype = MessageBox.TYPE_INFO
         Notifications.AddPopup(text = text, type=mtype, timeout = 10)
-        #Notifications.MessageBox(self.session, text=text, type=MessageBox.TYPE_INFO, timeout=10, 
-                                #close_on_any_key=True, 
-                                #default=True, 
-                                #enable_input=True, 
-                                #msgBoxID=None, 
-                                #picon=False, 
-                                #simple=False, 
-                                #wizard=False, 
-                                #list=None, 
-                                #skin_name=None, 
+        #Notifications.MessageBox(self.session, text=text, type=MessageBox.TYPE_INFO, timeout=10,
+                                #close_on_any_key=True,
+                                #default=True,
+                                #enable_input=True,
+                                #msgBoxID=None,
+                                #picon=False,
+                                #simple=False,
+                                #wizard=False,
+                                #list=None,
+                                #skin_name=None,
                                 #timeout_default=None)
         #return True
- 
+
     def select_stream(self):
         print "########[MoviePlayer] select_stream"
         lst = []
@@ -268,7 +270,7 @@ class PSPlayer(MoviePlayer):
             return
         self.selected = answer[1]
         service = make_service(self.streams[self.selected])
-        self.resume_pos = self.getSeek().getPlayPosition()[1]        
+        self.resume_pos = self.getSeek().getPlayPosition()[1]
         self.play_service(service)
 
     def serviceStarted(self):
@@ -277,8 +279,8 @@ class PSPlayer(MoviePlayer):
             self.resume_pos = 0
             print "doSeek",self.resume_pos
             #self.doSeek(self.resume_pos)
-            
-            
+
+
     def select_captions(self):
         print "########[MoviePlayer] select_caption"
         lst = []
@@ -325,7 +327,7 @@ class PSPlayer(MoviePlayer):
     #def showMovies(self):
             #pass
 
-        
+
 #####################################################################################################################
 class MainScreen(Screen):
     skin = """
@@ -356,7 +358,7 @@ class MainScreen(Screen):
     <widget name="key_yellow" position="430,535" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
     <ePixmap name="menu"   position="610,540" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
     <widget name="key_menu" position="610,535" size="140,40" valign="center" halign="center" zPosition="4"  backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    
+
 </screen>"""
 
     def __init__(self, session):
@@ -369,7 +371,7 @@ class MainScreen(Screen):
         self["key_yellow"] = Button(_("Options"))
         self["key_menu"] = Button("Menu")
         self["key_exit"] = Button("Back")
-        
+
         self["actions"] = ActionMap(["OkCancelActions", "ColorActions","MenuActions", "NumberActions"],
                                     {
                                         #"cancel": self.Cancel,
@@ -401,13 +403,13 @@ class MainScreen(Screen):
         #self.defimage0.PictureData.get().append(boundFunction(self.FinishDecodeDef, os.path.join(self.cur_directory,"PlayStream.png")))
         #self.defimage0.setPara((self["pic"].instance.size().width(),self["pic"].instance.size().height(),sc[0], sc[1], False, 0, "#00000000"))
         #self.defimage0.startDecode("default")
-        
+
         self.activeDownloads = 0
         self.images = {}
         self.images_url = {}
         self.picloads = {}
         self.history = []
-        
+
         reload(ContentSources)
         self.sources = ContentSources.ContentSources(os.path.join(self.cur_directory,"sources"))
         self.config = self.sources.plugins["config"]
@@ -433,7 +435,7 @@ class MainScreen(Screen):
     def setTitle2(self,title):
         #print self.keys()
         self["title"].setText(title)
-        
+
     def ShowDefPic(self):
         if self.defimage:
             self["pic"].instance.setPixmap(self.defimage)
@@ -458,7 +460,7 @@ class MainScreen(Screen):
             else: # local file
                 image_path = os.path.join(self.cur_directory,image_url)
                 self.start_decode(image_path,image_url)
-            
+
     def start_decode(self,image_path,image_url):
         self.images[image_url] = -2
         self.images_url[image_path] = image_url
@@ -481,12 +483,12 @@ class MainScreen(Screen):
         if len(self.images)>30:
             del self.images[self.images.keys()[0]]
             # self.images.pop()
-            
+
     #def FinishDecodeDef(self, image_path,picInfo = None):
     #    self.defimage = self.defimage0.getData()
     #    del self.defimage0
     #    self["pic"].instance.setPixmap(self.defimage)
-        
+
     def download_image(self,image_path,image_url):
         #print "Image download started",self.downloading,image_path,image_url
         self.downloading += 1
@@ -496,7 +498,7 @@ class MainScreen(Screen):
     def downloadFinished(self, image_path, image_url, result):
         self.downloading -= 1
         #print "[ Play] Image downloaded finished ",self.downloading,image_path, image_url,result
-        self.start_decode(image_path,image_url)       
+        self.start_decode(image_path,image_url)
 
     def downloadFailed(self, image_path, image_url,result):
         self.downloading -= 1
@@ -513,7 +515,7 @@ class MainScreen(Screen):
         data = current[1].split("::")[1] if "::" in current[1] else current[1]
         if not data:
             return
-        
+
         elif self.sources.is_video(current[1]):
             if self.sources.stream_type(current[1]):
                 stream = stream0.copy()
@@ -521,7 +523,7 @@ class MainScreen(Screen):
                 stream["name"] = current[0]
                 streams = [stream]
             else:
-                try:    
+                try:
                     streams = self.sources.get_streams(current[1])
                 except Exception,e:
                     print str(e)
@@ -541,7 +543,7 @@ class MainScreen(Screen):
             else:
                 self.msg("No stream found - %s"%(self.current[1]))
                 return
-                        
+
         elif current[1] == "back":
             cur_menu_old = self.cur_menu
             self.cur_menu = self.history.pop()
@@ -552,38 +554,38 @@ class MainScreen(Screen):
                 index = 0
             self.setTitle2(self.cur_menu[0])
             self.show_content(new_content,index)
-            
+
         else:
             print "selected=",current
             if "{0}" in current[1]:
-                self.session.openWithCallback(self.cb_input,VirtualKeyBoard, title="Enter value", text="")                 
+                self.session.openWithCallback(self.cb_input,VirtualKeyBoard, title="Enter value", text="")
                 #a = raw_input("Enter value:")
                 #a = "big bang"
                 #current = (current[0],current[1].format(a),current[2],current[3])
                 #self.get_content(current)
             else:
                 self.get_content(current)
-                
-                
+
+
     def cb_input(self,value):
         if not value:
             return
         current = self.current
         current = (current[0],current[1].format(value),current[2],current[3])
         self.get_content(current)
-    
-    def get_content(self,current):            
+
+    def get_content(self,current):
             self.history.append(self.cur_menu)
             self.cur_menu = current
             try:
                 new_content = self.sources.get_content(self.cur_menu[1])
             except Exception,e:
-                self.cur_menu = self.history.pop()                
+                self.cur_menu = self.history.pop()
                 self.session. open(MessageBox, "Error - %s"%str(e) , MessageBox.TYPE_INFO)
                 return
             self.setTitle2(self.cur_menu[0])
             self.show_content(new_content)
- 
+
     def Back(self):
         self["list"].setIndex(0)
         self.Ok()
@@ -599,12 +601,12 @@ class MainScreen(Screen):
                 #os.remove(os.path.join(TMPDIR, name))
             #os.rmdir(TMPDIR)
         self.close()
-            
-    
+
+
     def item_menu(self):
         print "\n[PlayStream] options\n"
         self.current = self["list"].getCurrent()
-        self.index = self["list"].getIndex()        
+        self.index = self["list"].getIndex()
         #self.session. open(MessageBox, "Item options - %s"%current[0] , MessageBox.TYPE_INFO)
         #args=[current,self.cur_menu]
         #self.session.open(ItemMenuScreen,current,index,self)
@@ -622,13 +624,13 @@ class MainScreen(Screen):
         else:
             lst.extend([
             ("Download videos in folder","download","Download videos in folder (if any)"),
-            ])            
+            ])
         if "config::" in self.cur_menu[1]:
             lst.extend([
             ("Rename item","rename","Rename list item"),
             ("Move item","move","Move list item"),
             ("Delete item","delete","Delete list item"),
-            ("Add submenu","add_list","Add submenu before selected item"), 
+            ("Add submenu","add_list","Add submenu before selected item"),
             ])
         title = self.current[0]
         self.session.openWithCallback(self.cb_item_menu, ChoiceBox, title = title, list = lst) #TODO
@@ -641,18 +643,18 @@ class MainScreen(Screen):
         if answer[1] == "info":
             self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)
             pass # TODO parada papildus info
-        
+
         elif answer[1] == "bouquet":
             #if not e2:
                 #e2 = enigma2_api.DBServices()
             #print "load_buuquets - ",e2._load_bouquets()
-            self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)            
-            
+            self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)
+
         elif answer[1] == "favorites":
             lists = self.config.get_lists()
-            lists2 = [(l,l) for l in lists]            
-            self.session.openWithCallback(self.cb_favorites, ChoiceBox, title="Selected menu item will be added",list = lists2) 
-                        
+            lists2 = [(l,l) for l in lists]
+            self.session.openWithCallback(self.cb_favorites, ChoiceBox, title="Selected menu item will be added",list = lists2)
+
         elif answer[1] == 'download':
             current = self.current
             if not self.sources.is_video(current[1]):
@@ -665,36 +667,36 @@ class MainScreen(Screen):
                 if n>0:
                     self.msg("%s videos download started"%n)
                 else:
-                    self.msg("No videos to download")   
+                    self.msg("No videos to download")
             else:
                 if self.download_video(current):
                     self.msg("Video download started")
-                                 
-                     
+
+
         elif answer[1] == 'download_list':
             self.download_list()
-            
+
         elif answer[1] == 'download_folder':
             #downloadDir = "/media/hdd/movie" #config.plugins.playstream.downloadDir.value TODO
             self.session.openWithCallback(self.select_download_dir, LocationBox,"Select download folder","",config.playstream.download_dir.value,config.playstream.locations,False,"Select folder",None,True,True)
-                  
+
         elif answer[1] == "delete":
             lst = self.cur_menu[1].replace("config::","")
             #print lst
             self.config.del_item(lst,self.index)
             self.config.write_streams()
             txt = "'%s' deleted from favourite stream list '%s'"%(self.current[0],lst)
-            self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)  
-            
+            self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)
+
         elif answer[1] == "rename":
             #name2 = "Renamed"
-            self.session.openWithCallback(self.cb_rename,VirtualKeyBoard, title="Enter new item name", text=self.current[0]) 
-            
+            self.session.openWithCallback(self.cb_rename,VirtualKeyBoard, title="Enter new item name", text=self.current[0])
+
         elif answer[1] == "add_list":
-            self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO,timeout=5)            
-            pass #TODO    
+            self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO,timeout=5)
+            pass #TODO
         return
-    
+
     def select_download_dir(self, downloadDir, select=None):
         if not downloadDir:
             return
@@ -702,11 +704,11 @@ class MainScreen(Screen):
         config.playstream.download_dir.setValue(downloadDir)
         config.playstream.download_dir.save()
         config.playstream.locations.save()
-        config.save()        
+        config.save()
 
     def download_list(self):
         self.session.open(VideoDownloadList)
-        
+
     def download_video(self,current):
         if self.sources.stream_type(current[1]):
             stream = stream0.copy()
@@ -714,7 +716,7 @@ class MainScreen(Screen):
             stream["name"] = current[0]
             streams = [stream]
         else:
-            try:    
+            try:
                 streams = self.sources.get_streams(current[1])
             except Exception,e:
                 print "Error - %s"%str(e)
@@ -727,11 +729,12 @@ class MainScreen(Screen):
             if not s["name"]: s["name"] = current[0]
             if not s["img"]: s["img"] = current[2]
             if not s["desc"]: s["desc"] = current[3]
-        
+
         if len(streams)>1:
             stream = streams[0] # TODO iespeja izvelēties strīmu, ja to ir vairāki
         else:
             stream = streams[0]
+        stream = util.stream_change(stream)
         return self.download_stream(stream)
 
     def download_stream(self,stream):
@@ -739,11 +742,11 @@ class MainScreen(Screen):
         #self.msg("Start downloading..")
         self.stream = stream
         stream_type = self.stream["type"] #self.sources.stream_type(stream["url"])
-        if not stream_type: # 
+        if not stream_type: #
             print "Not supported stream type found to download - %s"%(self.current[1])
             self.msg("Not supported stream type found to download - %s"%(self.current[1]))
             return
-        
+
         title = self.stream["name"].strip()
         url = self.stream["url"]
         stream_type = self.stream["type"] #self.sources.stream_type(stream["url"])
@@ -759,55 +762,55 @@ class MainScreen(Screen):
         #print "Trying to download - ", current
         if self.stream["subs"]:
             suburl = self.stream["subs"][0]["url"]
-            print "\n**Download subtitles %s - %s"%(title,suburl)  
+            print "\n**Download subtitles %s - %s"%(title,suburl)
             subs = urllib2.urlopen(suburl).read()
             if subs:
-                #fname0 = re.sub("[/\n\r\t,:]"," ",title)                
+                #fname0 = re.sub("[/\n\r\t,:]"," ",title)
                 subext = ".srt"
                 subfile = os.path.join(downloadDir,fname0+subext)
                 if ".xml" in suburl:
-                    subs = util.ttaf2srt(subs) 
+                    subs = util.ttaf2srt(subs)
                 with open(subfile,"w") as f:
                     f.write(subs)
             else:
                 print "\n Error downloading subtitle %s"%suburl
-                
+
         if os.path.exists(outputfile):
             self.msg( _('Sorry, this file already exists:\n%s') % outputfile)
             return False
             #os.remove(outputfile)
-            
-        if stream_type in ("http","https"):  
-            print "\n**Download %s - %s"%(title,url)                
+
+        if stream_type in ("http","https"):
+            print "\n**Download %s - %s"%(title,url)
             #reload(downloadJob)
             job_manager.AddJob(downloadJob(url, outputfile, title[:20], self.video_download_stop))
             self.activeDownloads += 1
             #self.msg(_('Video download started!'))
             return True
-            
+
         elif stream_type == "hls":
             #self.msg("HLS stream download not yet implemented!")
-            print "\n**Download %s - %s"%(title,url)                
+            print "\n**Download %s - %s"%(title,url)
             #reload(HLSDownloadJob)
             print "HLSDownload", url,outputfile
             job_manager.AddJob(HLSDownloadJob(url, outputfile, title[:20], self.video_download_stop))
             self.activeDownloads += 1
             #self.msg(_('Video download started!'))
             return True
-            
+
         elif stream_type == "rstp":
             self.msg("RSTP stream download not yet implemented!")
             return False
         else:
             self.msg("Unkown stream type!")
             return False
-        
-    
+
+
     def cb_rename(self,value):
         if not value:
             return
         lst = self.cur_menu[1].replace("config::","")
-        pos = self.index        
+        pos = self.index
         print value
         item2 = list(self.current)
         item2[0]=value
@@ -815,19 +818,19 @@ class MainScreen(Screen):
         self.config.replace_item(lst,item2,pos)
         self.config.write_streams()
         txt = "'%s' renamed to '%s'"%(self.current[0],value)
-        self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)     
-        
+        self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)
+
     def cb_favorites(self,answer):
         print "cb_favorites",answer,self.current
         if not answer:
-            return 
+            return
         value = answer[1]
         self.config.add_item(value,self.current)
         self.config.write_streams()
         txt = "'%s' added to favourite stream list '%s'"%(self.current[0],value)
         self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=3)
         #self.session.openWithCallback(self.callMyMsg, MessageBox, _("Do you want to exit the plugin?"), MessageBox.TYPE_INFO)
-        
+
     def options_screen(self):
         source = self.cur_menu[1].split("::")[0]
         options = self.sources.options_read(source)
@@ -835,17 +838,17 @@ class MainScreen(Screen):
         if not options:
             self.session. open(MessageBox, "No options available for source %s (%s)"%(self.cur_menu[0],source) , MessageBox.TYPE_INFO)
         else:
-            self.session.open(OptionsScreen,self)        
-        
+            self.session.open(OptionsScreen,self)
+
     def video_download_stop(self,title):
         #self.activeDownloads -= 1
         #self.msg("Download '%s'finished!"%title)
         print "video_download_stop ", title
-        
+
     def msg2(self,msg,timeout=10,mtype = None):
-        mtype=mtype if mtype else MessageBox.TYPE_INFO 
+        mtype=mtype if mtype else MessageBox.TYPE_INFO
         Notifications.AddPopup(text = msg, type=mtype, timeout=timeout)
-        
+
     def msg(self,msg,timeout=10):
         self.session.open(MessageBox, msg, MessageBox.TYPE_INFO, timeout)
 ##########################################################################
@@ -878,7 +881,7 @@ class OptionsScreen(ConfigListScreen,Screen):
         self.setTitle(self.main.cur_menu[0]+" options")
         self.source = self.main.cur_menu[1].split("::")[0]
         self.cfg = config.plugins.playstream
-        self.list = []       
+        self.list = []
         self.options = self.main.sources.options_read(self.source)
         if not self.options:
             #self.session. open(MessageBox, "No options available for source %s (%s)"%(self.main.cur_menu[0],self.source) , MessageBox.TYPE_INFO)
@@ -887,7 +890,7 @@ class OptionsScreen(ConfigListScreen,Screen):
             self.cfg[k]=ConfigText(default=self.options[k],fixed_size=False)
             self.list.append(getConfigListEntry(k, self.cfg[k]))
         ConfigListScreen.__init__(self, self.list, session = self.session)
-        
+
         self["key_red"] = Button(_("Cancel"))
         self["key_green"] = Button("Save")
         self["key_yellow"] = Button("")
@@ -913,7 +916,7 @@ class OptionsScreen(ConfigListScreen,Screen):
             #folder  = config.plugins.getpicons.folder.value
             #self.session.openWithCallback(self.change_dir, LocationBox,"Select Folder")
         #else:
-            
+
 
     #def change_dir(self, folder, select=None):
         #if folder:

changelog.md

@@ -1,3 +1,9 @@
+**0.5p** (15.01.2016):
+- movieplace.lv saturs (daļēji, nav meklēšanas, seariālu, ne visi video hostingi,)
+- hqq hostētus strīmus spēlē ar stream_type=5002 (ja ir exteplayer3) + proxy, jo gstreamrim ir problēmas
+- kodik, kapnob resolveri priekš movieplace.lv
+- u.c. labojumi
+
 **0.5n** (15.01.2016):
 - salabots filmix (tagad filmix.me)
 - .ts strīmus spēlē ar service_type = 1 (nevis 4097)

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.5n
+    set ver=0.5o
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF
@@ -51,7 +51,8 @@ sources\euronews.py
 sources\filmix.py            
 sources\filmon.py            
 sources\iplayer.py           
-sources\kinofilmnet.py       
+sources\kinofilmnet.py
+sources\movieplace.py       
 sources\ltc.py               
 sources\mtgplay.py           
 sources\play24.py            
@@ -68,6 +69,9 @@ resolvers\__init__.py
 resolvers\aadecode.py
 resolvers\hqqresolver.py
 resolvers\openload3.py
+resolvers\hdgo.py
+resolvers\kapnob.py
+resolver\kodik.py
 resolvers\youtuberesolver.py
 picons\*.*
 ) do echo f | xcopy /y /q %%f %ipk_dir%data\%ext_dir%%prog%\%%f

playstreamproxy

@@ -1,5 +1,5 @@
 #!/bin/sh
-DAEMON=/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/streamproxy.py 
+DAEMON=/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/playstreamproxy.py 
 NAME=streamproxy
 DESC="StreamProxy"
 

playstreamproxy.bat

@@ -1 +1 @@
-python streamproxy.py manualstart
+python playstreamproxy.py manualstart

playstreamproxy.py

@@ -78,7 +78,7 @@ class StreamHandler(BaseHTTPRequestHandler):
             #sessions[base_url] = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))    
         else:
             pass
-        ses=sessions[base_url]
+        ses = sessions[base_url]
         if DEBUG: print "**Request headers: "
         ses.headers.update(headers)
         #ses.addheaders=[]
@@ -93,9 +93,10 @@ class StreamHandler(BaseHTTPRequestHandler):
         for h in r.headers: 
             if DEBUG: print h,"=",r.headers[h]
         self.send_response(code)
+        if DEBUG: print "**Return headers:"
         for h in r.headers:
-            if h in ("user-agent","server"):continue
-            if h=="connection":
+            if h.lower() in ("user-agent","server"):continue
+            if h.lower()=="connection":
                 if DEBUG: print h," skipped"
                 continue
             self.send_header(h, r.headers[h])

resolver.py

@@ -41,7 +41,7 @@ for module in os.listdir(os.path.join(os.path.dirname(__file__), server_path)):
     #resolver = eval(module)
     resolver = __import__(module)
     #reload(resolver)
-    
+
     if not hasattr(resolver, 'resolve'):
         continue
     print 'found %s %s' % (resolver, dir(resolver))
@@ -53,7 +53,7 @@ for module in os.listdir(os.path.join(os.path.dirname(__file__), server_path)):
 RESOLVERS = sorted(RESOLVERS, key=lambda m: -m.__priority__)
 
 def item():
-    stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}            
+    stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
     return stream0
 
 def resolve(url):
@@ -69,20 +69,20 @@ def resolve(url):
     resolver = _get_resolver(url)
     value = None
     if resolver is None:
-        return None
+        return []
     util.info('Using resolver \'%s\'' % str(resolver.__name__));
     value = resolver.resolve(url)
-    if value is None:
-        return False
+    if not value:
+        return []
     default = item()
     for i in value:
+        i["resolver"] = resolver.__name__
         if 'name' not in i.keys():
             i['name'] = resolver.__name__
-        if 'surl' not in i.keys():
-            i['surl'] = url
+        i['surl'] = url
         for key in default.keys():
             if key not in i.keys():
-                i[key] = default[key]   
+                i[key] = default[key]
         if "|" in i["url"]:
             headers = i["url"].split("|")[1]
             i["url"]=i["url"].split("|")[0]
@@ -118,8 +118,8 @@ if __name__ == "__main__":
     #url = "https://kinostok.tv/embed/731f3437e3c53104dd56d04039a0b15a"
     #url = "http://vk.com/video_ext.php?oid=246066565&id=169244575&hash=d430ab0e76c9f7a1&hd=3"
     #url ="https://openload.co/embed/rPMXJYPTkw4/"
-    #url = "https://openload.co/embed/bE7WfZ-vz_A/" 
-    #url = "https://openload.co/embed/bE7WfZ/" 
+    #url = "https://openload.co/embed/bE7WfZ-vz_A/"
+    #url = "https://openload.co/embed/bE7WfZ/"
     #url = "https://openload.co/embed/OuskaKyC2GU/"
     url = "http://hqq.tv/player/embed_player.php?vid=235238210241210222228241233208212245&autoplay=no"
     url = "https://hqq.tv/player/embed_player.php?vid=235242211228257255206246241253244213194271217261258"
@@ -138,7 +138,7 @@ if __name__ == "__main__":
     for s in streams:
         print s
 
-    print streams[0]["url"] 
+    print streams[0]["url"]
     util.play_video(streams)
     ##call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",streams[0]["url"]])
     pass

resolvers/hqqresolver.py

@@ -13,11 +13,21 @@
 from StringIO import StringIO
 import json
 import re
-import util
 import base64
 import urllib
+import sys,os
 
-__name__ = 'hqq'
+try:
+    import util
+except:
+    pp = os.path.dirname(os.path.abspath(__file__))
+    sys.path.insert(0,os.sep.join(pp.split(os.sep)[:-1]))
+    import util
+import requests
+
+__author__ = 'ivars777'
+if __name__ <> "__main__":
+    __name__ = 'hqq'
 
 
 def supports(url):
@@ -149,8 +159,12 @@ def resolve(url):
                 vid_link = re.search(r'var\s*%s\s*=\s*"([^"]*?)"'%link_1, data)
                 at = re.search(r'var\s*at\s*=\s*"([^"]*?)"', data)
                 vid = re.search('vid: "([^"]+)"',data)
-                subs = re.search('sub:"(.+?)"',data).group(1) if re.search('sub:"(.+?)"',data) else ""
+                sub_url = re.search('sub:"(.+?)"',data).group(1) if re.search('sub:"(.+?)"',data) else ""
                 subs_lang = re.search('sublangs:"(.+?)"',data).group(1) if re.search('sub:"(.+?)"',data) else ""
+                if sub_url:
+                    subs=[{"url":sub_url,'name':subs_lang,"lang":subs_lang}]
+                else:
+                    subs = []
                 if vid_server and vid_link and at:
                     get_data = {'server_1': vid_server.group(1),
                                 'link_1': vid_link.group(1),
@@ -166,9 +180,11 @@ def resolve(url):
                         file_url = _decode2(data['file'])
                         file_url = re.sub(r'\?socket=?$', '.mp4.m3u8',file_url)
                         stream  = {
-                            'url': file_url, 
-                            'subs':[{"url":subs,'name':subs_lang,"lang":subs_lang}],
-                            'quality': '?',
+                            'url': file_url,
+                            'name': file_url,
+                            'subs':subs,
+                            'quality': 'hqq',
+                            'resolver': 'hqq',
                             "headers":{"User-Agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/47.0.2526.70 Mobile/13C71 Safari/601.1.46"}
                         }
                         return [stream]
@@ -180,7 +196,7 @@ def _regex(url):
     match = re.search("(hqq|netu)\.tv/watch_video\.php\?v=(?P<vid>[0-9A-Z]+)", url)
     if match:
         return match
-    match = re.search(r'(hqq|netu)\.tv/player/embed_player\.php\?vid=(?P<vid>[0-9A-Z]+)', url)
+    match = re.search(r'(hqq|netu)\.tv/player/embed_player\.php\?vid=(?P<vid>[0-9A-Za-z]+)', url)
     if match:
         return match
     match = re.search(r'(hqq|netu)\.tv/player/hash\.php\?hash=\d+', url)
@@ -192,7 +208,7 @@ def _regex(url):
     match = re.search("(goo)\.gl/(?P<vid>[\w]+)", url)
     if match:
         return match
-    
+
     b64enc = re.search(r'data:text/javascript\;charset\=utf\-8\;base64([^\"]+)', url)
     b64dec = b64enc and base64.decodestring(b64enc.group(1))
     enc = b64dec and re.search(r"\'([^']+)\'", b64dec).group(1)
@@ -203,3 +219,16 @@ def _regex(url):
                      decoded) and match:
             return match
     return None
+
+if __name__ == "__main__":
+
+    url = "http://hqq.tv/player/embed_player.php?vid=nYAKgzBAf7ll"
+    streams = resolve(url)
+    if not streams:
+        print "No streams found"
+        sys.exit()
+    for s in streams:
+        print s
+    print streams[0]["url"]
+    util.play_video(streams)
+    pass

sources/viaplay.py

@@ -23,9 +23,9 @@ except:
     import util
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self,language="en"):
         self.name = "viaplay"
         self.title = "viaplay.lv"
@@ -47,13 +47,13 @@ Upgrade-Insecure-Requests: 1
         self.r = None # requests
         self.play_session = None
         self.s = None
-        
+
     def login(self,user="",password=""):
         self.options_read()
         if not user: user=self.options["user"]
         if not password: password = self.options["password"]
         self.s = requests.Session()
-        
+
         ### Dabu sesijas ID ===
         headers = headers2dict("""
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36
@@ -61,17 +61,17 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 Accept-Language: en-US,en;q=0.5
 Accept-Encoding: gzip, deflate, br
 Referer: https://viaplay.lv/
-Cookie: ott_cookies_confirmed=1; 
+Cookie: ott_cookies_confirmed=1;
 DNT: 1
 Connection: keep-alive
 Upgrade-Insecure-Requests: 1
-""")   
+""")
         r = requests.get(self.url,headers=headers)
         if not "PLAY_SESSION" in r.cookies:
             return False
         self.play_session = r.cookies["PLAY_SESSION"]
         self.csrfToken = re.search("csrfToken=(.+)",self.play_session).group(1)
-        
+
         ### Ielogojamies ###
         headers = headers2dict("""
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.71 Safari/537.36
@@ -96,7 +96,7 @@ Content-Type: application/x-www-form-urlencoded
             self.play_session = None
             return False
         self.ott = r.cookies["ott_web_sac"]
-        
+
         ### Dabu iekārtas ID ###
         if not self.device:
             headers = headers2dict("""
@@ -121,10 +121,10 @@ Connection: keep-alive    """)
             self.options["device"] = self.device
             self.options_write(self.options)
         return True
-    
+
     def logout(self):
         return True
-    
+
     def is_logedin(self):
         if self.play_session:
             return True
@@ -144,7 +144,7 @@ X-Requested-With: XMLHttpRequest
 DNT: 1
 Connection: keep-alive
 Referer: https://viaplay.lv/
-""")   
+""")
         url = "https://viaplay.lv/prehravac/init?_infuse=1&productId=%s"%vid #t110623
         headers["Cookie"] = "ott_cookies_confirmed=1; ott_dids=%s; PLAY_SESSION=%s"%(self.device,self.play_session)
         r = requests.get(url,headers=headers,allow_redirects=False)
@@ -164,17 +164,17 @@ Referer: https://viaplay.lv/
         js = demjson.decode(txt)
         return js
         #return txt
-            
-    
+
+
     def get_content(self, data):
         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"))
-        
+
         if clist=="home":
             content.extend([
-                ("Search", "viaplay::search-results-all?query={0}",self.img,"Meklēt"),                
+                ("Search", "viaplay::search-results-all?query={0}",self.img,"Meklēt"),
                 ("Filmas", "viaplay::movies",self.img,"Filmas"),
                 ("Seriāli", "viaplay::series",self.img,"Seriāli"),
                 ("Bērniem", "viaplay::kids",self.img,"Bērniem"),
@@ -182,7 +182,7 @@ Referer: https://viaplay.lv/
                 ("Sports", "viaplay::live",self.img,"Sports"),
              ])
             return content
-        
+
         ### Meklēt ###
         elif clist=="search-results-all":
             url = "https://viaplay.lv/"+data
@@ -202,10 +202,10 @@ Referer: https://viaplay.lv/
                 else:
                     title = "%s - %s%s"%(title,seas,ep)
                 desc = "%s\n%s\n%s"%(title,desc2,desc)
-                content.append((title,self.name+"::"+data2,img,desc))             
+                content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
-        ### Sadalas ##  
+
+        ### Sadalas ##
         elif data in ["movies","series","kids","documentary"]:
             r = self._http_request(self.url+data)
             # https://viaplay.lv/tdi/movies/next?sections[]=MOVIES&genres[]=a3591&sort[]=latest&offset=0
@@ -220,26 +220,26 @@ Referer: https://viaplay.lv/
                 if data in ("movies","series"):
                     title = "%s - %s"%(nosaukums[data],sort[s])
                     data2 = "%s/next?sections[]=%s&sort[]=%s"%(data,sections[data],s)
-                    content.append((title,self.name+"::"+data2,self.img,title)) 
+                    content.append((title,self.name+"::"+data2,self.img,title))
                 else:
                     title = "%s filmas - %s"%(nosaukums[data],sort[s])
                     data2 = "%s/next?sections[]=%s&cat[]=MOVIE&sort[]=%s"%(data,sections[data],s)
-                    content.append((title,self.name+"::"+data2,self.img,title)) 
+                    content.append((title,self.name+"::"+data2,self.img,title))
                     title = "%s seriāli - %s"%(nosaukums[data],sort[s])
                     data2 = "%s/next?sections[]=%s&cat[]=SERIES&sort[]=%s"%(data,sections[data],s)
-                    content.append((title,self.name+"::"+data2,self.img,title))             
-                    
-            # Pievienojam žanru sarakstu 
+                    content.append((title,self.name+"::"+data2,self.img,title))
+
+            # Pievienojam žanru sarakstu
             result = re.findall(r'name="genres\[\]" value="([^"]+)">.+?class="">([^<]+)</label>', r, re.DOTALL)
             for item in result:
                 s = "latest"
                 genre = item[1].replace("&amp;","&")
                 title = "%s: %s"%(nosaukums[data],genre)
                 data2 = "%s/next?sections[]=%s&genres[]=%s&sort[]=%s"%(data,sections[data],item[0],s)
-                content.append((title,self.name+"::"+data2,self.img,title))                 
-                
+                content.append((title,self.name+"::"+data2,self.img,title))
+
             return content
-        
+
         ### Filmu/seriālu/sēriju saraksts ###
         elif clist in ("movies","series","kids","documentary") and plist[1] == "next":
             url = "https://viaplay.lv/tdi/"+data
@@ -257,7 +257,7 @@ Referer: https://viaplay.lv/
                     desc2 = item[7]
                     title = "%s - %s%s"%(title,seas,ep)
                     desc = "%s\n%s\n%s"%(title,desc2,desc)
-                    content.append((title,self.name+"::"+data2,img,desc))  
+                    content.append((title,self.name+"::"+data2,img,desc))
             else: # filmas
                 result = re.findall(r'<div id="product-(\w+)".+?<a href="([^"]+)">.+?<img data-srcset="([^ ]+).+?alt="([^"]+)">.+?<p>([^<]+)</p>.+?<p class="promo-notice">([^<]+).+?<p class="is-strong detail">(.+?)</p>.+?<p class="info">([^<]+)</p>', r, re.DOTALL)
                 for item in result:
@@ -273,13 +273,13 @@ Referer: https://viaplay.lv/
                     genre = ("".join(genre)).replace("&amp;","&")
                     desc2 = item[7]
                     desc = "%s\n%s\n%s"%(genre,desc2,desc)
-                    content.append((title,self.name+"::"+data2, img,desc))   
+                    content.append((title,self.name+"::"+data2, img,desc))
             m = re.search(r"data\('href', 'https://viaplay\.lv/tdi/([^']+)'\)", r, re.DOTALL)
             if m:
                 data2 = m.group(1)
-                content.append(("Next page",self.name+"::"+data2,img,"Next page"))                 
+                content.append(("Next page",self.name+"::"+data2,img,"Next page"))
             return content
-        
+
         ### Seriāls ###
         elif clist == "series" and len(plist)==2:
             url = "https://viaplay.lv/"+data
@@ -296,16 +296,16 @@ Referer: https://viaplay.lv/
                 if "availability=" in data2: continue
                 content.append((title,self.name+"::"+data2,self.img,title)) #TODO bilde
             return content
-                              
+
     def is_video(self,data):
-        source,data,path,plist,clist,params,qs = self.parse_data(data)        
+        source,data,path,plist,clist,params,qs = self.parse_data(data)
         if clist in ("movies","documentary","kids") and len(plist)>1 and plist[1]<>"next":
             return True
         elif clist == "series"  and len(plist)>1 and plist[1] == "episode":
             return True
         else:
             return False
-        
+
     def get_streams(self, data):
         print "[viaplay] get_streams:", data
         if not self.is_video(data):
@@ -315,7 +315,7 @@ Referer: https://viaplay.lv/
             self.login()
         if not self.is_logedin():
             raise Exception("Could not login to viaplay.lv, check username/password in options")
-        
+
         streams = []
         url = "https://viaplay.lv/"+data
         r = self._http_request(url)
@@ -343,15 +343,15 @@ Referer: https://viaplay.lv/
             desc2 = desc2.replace("\n"," ").replace("\t","")
             desc = "%s\n%s"%(desc2,desc)
             vid = m.group(1)
-        
+
         js = self.get_video_info(vid)
-        #for m in re.finditer(r"lang: '(?P<lang>\w+)',\s+src: '(?P<url>[^']+)',\s+type: '(?P<mime>[^']+)',\s+drm: \[(?P<drm>.+?)\]\s*\}", r, re.DOTALL):               
+        #for m in re.finditer(r"lang: '(?P<lang>\w+)',\s+src: '(?P<url>[^']+)',\s+type: '(?P<mime>[^']+)',\s+drm: \[(?P<drm>.+?)\]\s*\}", r, re.DOTALL):
         if not js:
             return []
         tracks = js["tracks"]
         #if not tracks["HLS"]:
         #    raise Exception("Encrypted DASH playing not yet implemented")
-        
+
         captions = []
         llist = ["fr","en","ru","lv"]
         for st in js["plugins"]["settings"]["subtitles"]:
@@ -360,19 +360,20 @@ Referer: https://viaplay.lv/
             sub["lang"] = st["srclang"]
             sub["name"] = st["label"]
             sub["type"] = "vtt"
-            sub["order"] = llist.index(sub["lang"])*10 if sub["lang"] in llist else 0            
-            captions.append(sub)       
-        captions = sorted(captions,key=lambda item: item["order"],reverse=True) 
-        
+            sub["order"] = llist.index(sub["lang"])*10 if sub["lang"] in llist else 0
+            captions.append(sub)
+        captions = sorted(captions,key=lambda item: item["order"],reverse=True)
+
         for s in tracks["HLS"] if tracks["HLS"]  else tracks["DASH"] :
             stype = "DASH" if "dash" in s["type"] else "HLS"
-            if "drm" in s: ### 
+            if "drm" in s: ###
                 # TODO, encrypted stream
                 continue
             url = s["src"]
-            urlp = util.streamproxy_encode(s["src"])
+            #urlp = util.streamproxy_encode(s["src"])
             stream = util.item()
-            stream["url"]=urlp
+            stream["url"]=url
+            stream["resolver"] = "viaplay"
             stream["lang"]=s["lang"]
             stream["quality"]="variant"
             stream["bitrate"]= "1000000"
@@ -380,12 +381,12 @@ Referer: https://viaplay.lv/
             stream["desc"]=desc
             stream["type"]=stype
             stream["subs"] = captions
-            print urlp
+            print url
             if stype=="DASH": streams.append(stream)
-            
+
             if stype == "HLS": # izvelkam individuālos strimus
                 r = requests.get(url)
-                result = re.findall("#EXT-X-STREAM-INF:BANDWIDTH=(\d+),RESOLUTION=(\d+x\d+)\n(\w+.m3u8)", r.content)            
+                result = re.findall("#EXT-X-STREAM-INF:BANDWIDTH=(\d+),RESOLUTION=(\d+x\d+)\n(\w+.m3u8)", r.content)
                 if not result:
                     continue
                 for s2 in result:
@@ -400,7 +401,7 @@ Referer: https://viaplay.lv/
                     #if "set-cookie" in r2.headers:
                         #headers = {"Cookie":r2.headers["set-cookie"]}
                     #else:
-                        #headers={}                   
+                        #headers={}
                     url2p=util.streamproxy_encode(url2,headers)
                     stream = util.item()
                     stream["url"]=url2p
@@ -411,26 +412,26 @@ Referer: https://viaplay.lv/
                     stream["bitrate"]=s2[0]
                     stream["type"]="DASH" if "dash" in s["type"] else "HLS"
                     streams.append(stream)
-                        
+
         ### TODO - sakārtot sarakstu, lai pirmais ir labakais video
         qlist = ["","512","640","758","1024","variant"]
-        llist = ["lt","et","fr","en","ru","lv"]        
+        llist = ["lt","et","fr","en","ru","lv"]
         for s in streams:
             lv = llist.index(s["lang"])*10000000 if s["lang"] in llist else 0
             #qv=qlist.index(s["quality"]) if s["quality"] in qlist else 0
             qv = int(s["bitrate"]) if s["bitrate"] else 0
             s["order"] = lv+qv
             #print s["lang"],s["quality"],s["bitrate"],s["order"]
-            
+
         streams = sorted(streams,key=lambda item: item["order"],reverse=True)
         return streams
-        
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country
         url = "https://viaplay.lv/tdi/" + data
         content = self._http_request(url, params, headers)
-        return content        
+        return content
 
 if __name__ == "__main__":
     if len(sys.argv)>1:
@@ -465,7 +466,7 @@ if __name__ == "__main__":
         if "HLS" in vinfo["tracks"]:
             for s in vinfo["tracks"]["HLS"]:
                 print "HLS %s: \n%s"%(s["lang"],s["src"])
-                
+
         if "DASH" in vinfo["tracks"]:
             for s in vinfo["tracks"]["DASH"]:
                 print "DASH %s: \n%s"%(s["lang"],s["src"])

util.py

@@ -50,7 +50,7 @@ CACHE_COOKIES = 'cookies'
 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"].encode("utf8"),s["type"],s["name"])
         a = raw_input("Select stram to play: ")
         try:
@@ -64,27 +64,28 @@ def play_video(streams):
     else:
         stream = streams[0]
 
+    stream = stream_change(stream)
     title = stream["name"]
     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)  
+        print "\n**Download subtitles %s - %s"%(title,suburl)
         subs = urllib2.urlopen(suburl).read()
         if subs:
-            fname0 = re.sub("[/\n\r\t,]","_",title)                
+            fname0 = re.sub("[/\n\r\t,]","_",title)
             subext = ".srt"
             subfile = os.path.join("",fname0+subext)
             if ".xml" in suburl:
-                subs = ttaf2srt(subs) 
+                subs = ttaf2srt(subs)
             with open(subfile,"w") as f:
                 f.write(subs)
         else:
             print "\n Error downloading subtitle %s"%suburl
-    return player(url,stream["name"],suburl)
-            
-def player(url,title="",suburl=""):
+    return player(url,stream["name"],suburl,stream["headers"])
+
+def player(url,title="",suburl="",headers={}):
     from subprocess import call
     print "\n**Play stream %s\n%s"%(title,url.encode("utf8"))
     cmd1 = [r"c:\Program Files\VideoLAN\VLC\vlc.exe",url,
@@ -95,7 +96,7 @@ def player(url,title="",suburl=""):
     cmd2 = [
         r"C:\gstreamer\1.0\x86_64\bin\gst-launch-1.0","-v",
         "playbin", 'uri="%s"'%url,
-        #"souphttpsrc", "ssl-strict=false",       
+        #"souphttpsrc", "ssl-strict=false",
         #"proxy=127.0.0.1:8888",
         #'location="%s"'%url,
         #'!decodebin!autovideosink'
@@ -107,20 +108,32 @@ def player(url,title="",suburl=""):
     return
 
 SPLIT_CHAR = "~"
-SPLIT_CODE = "%7E"
-EQ_CODE = "%3D"
-COL_CODE = "%3A"
+SPLIT_CODE = urllib.quote(SPLIT_CHAR)
+EQ_CODE = urllib.quote("=")
+COL_CODE = urllib.quote(":")
+SPACE_CODE = urllib.quote(" ")
 PROXY_URL = "http://localhost:88/"
 
+def stream_change(stream):
+    #return stream # TODO
+    if stream["surl"]:
+        if not re.search("https*://(hqq|goo.\gl)",stream["surl"]):
+            return stream
+        stream["url"] = streamproxy_encode(stream["url"],stream["headers"])
+        stream["headers"] = {}
+        return stream
+    else:
+        return stream
+
 def streamproxy_encode(url,headers=[]):
     if not "?" in url:
         url = url+"?"
-    url2 = url.replace(SPLIT_CHAR,SPLIT_CODE).replace(":",COL_CODE)
+    url2 = url.replace(SPLIT_CHAR,SPLIT_CODE).replace(":",COL_CODE).replace(" ",SPACE_CODE)
     url2 = PROXY_URL + url2
     if headers:
         headers2 = []
         for h in headers:
-            headers2.append("%s=%s"%(h,headers[h].replace("=",EQ_CODE).replace(SPLIT_CHAR,SPLIT_CODE)))
+            headers2.append("%s=%s"%(h,headers[h].replace("=",EQ_CODE).replace(SPLIT_CHAR,SPLIT_CODE).replace(" ",SPACE_CODE)))
         headers2 = SPLIT_CHAR.join(headers2)
         url2 = url2+SPLIT_CHAR+headers2
     return url2
@@ -130,10 +143,11 @@ def streamproxy_decode(urlp):
     path = urlp.replace(re.search("http://[^/]+",urlp).group(0),"")
     p = path.split(SPLIT_CHAR)
     url = urllib.unquote(p[0][1:])
-    #headers = {"User-Agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/47.0.2526.70 Mobile/13C71 Safari/601.1.46"}    
+    #headers = {"User-Agent":"Mozilla/5.0 (iPhone; CPU iPhone OS 9_2 like Mac OS X) AppleWebKit/601.1 (KHTML, like Gecko) CriOS/47.0.2526.70 Mobile/13C71 Safari/601.1.46"}
     headers={}
     if len(p)>1:
         for h in p[1:]:
+            #h = urllib.unquote()
             headers[h.split("=")[0]]=urllib.unquote(h.split("=")[1])
     return url,headers
 
@@ -145,15 +159,16 @@ class Captions(object):
             r = requests.get(uri)
         if r.status_code == 200:
             self.loads(r.content)
-            
+
     def loads(self,s):
         if "WEBVTT" in s[:s.find("\n")]: # vtt captions
             self.load_vtt(s)
         elif "<?xml" in s[:s.find("\n")]:
             self.load_ttaf(s)
         else:
-            return
-        
+            self.load_vtt(s) # TODO
+
+
     def load_ttaf(self,s):
         for r2 in re.findall("<style .+?/>", s):
             st = {}
@@ -161,7 +176,7 @@ class Captions(object):
                 st[a[0]] = a[1]
                 if a[0] == "id":
                     sid = a[1]
-            self.styles[sid] = st  
+            self.styles[sid] = st
         for r2 in re.findall("<p .+?</p>", s):
             sub = {}
             sub["begin"] = str2sec(re.search('begin="([^"]+)"', r2).group(1)) if re.search('begin="([^"]+)"', r2) else -1
@@ -170,9 +185,9 @@ class Captions(object):
             sub["text"] = re.search("<p[^>]+>(.+)</p>", r2).group(1).replace("\n","")
             sub["text"] = re.sub("<br\s*?/>","\n",sub["text"])
             sub["text"] = re.sub("<.+?>"," ",sub["text"])
-            self.subs.append(sub)  
+            self.subs.append(sub)
         pass
-                  
+
     def load_vtt(self,s):
         f = StringIO.StringIO(s)
         while True:
@@ -194,23 +209,23 @@ class Captions(object):
                     sub["text"].append(txt)
                     line = f.readline()
                 sub["text"] = "\n".join(sub["text"])
-                self.subs.append(sub)                    
+                self.subs.append(sub)
             else:
                 continue
         pass
-            
+
 def str2sec(r):
     # Convert str time to miliseconds
     r= r.replace(",",".")
     m = re.search(r"(\d+\:)*(\d+)\:(\d+\.\d+)", r)
     if m:
-        sec = int(m.group(1)[:-1])*60*60*1000 if m.group(1) else 0 
+        sec = int(m.group(1)[:-1])*60*60*1000 if m.group(1) else 0
         sec += int(m.group(2))*60*1000 + int(float(m.group(3))*1000)
         return sec
     else:
         return -1
 
-#c = Captions("http://195.13.216.2/mobile-vod/mp4:lb_barbecue_fr_lq.mp4/lb_barbecue_lv.vtt")  
+#c = Captions("http://195.13.216.2/mobile-vod/mp4:lb_barbecue_fr_lq.mp4/lb_barbecue_lv.vtt")
 #c = Captions("http://www.bbc.co.uk/iplayer/subtitles/ng/modav/bUnknown-0edd6227-0f38-411c-8d46-fa033c4c61c1_b05ql1s3_1479853893356.xml")
 #url = "http://195.13.216.2/mobile-vod/mp4:ac_now_you_see_me_2_en_lq.mp4/ac_now_you_see_me_2_lv.vtt"
 #c = Captions(url)
@@ -229,11 +244,11 @@ def ttaf2srt(s):
         end = end.replace(".",",")
         txt2 = re.sub("<br */>","\n",txt)
         out += "%s\n%s --> %s\n%s\n\n"%(i,begin,end,txt2)
-    return out    
+    return out
 
 
 def item():
-    stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}            
+    stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
     return stream0
 
 class _StringCookieJar(cookielib.LWPCookieJar):
@@ -278,7 +293,7 @@ def request0(url, headers={}):
         data = response.read()
         response.close()
     except urllib2.HTTPError, error:
-        data = error.read()    
+        data = error.read()
 
     debug('len(data) %s' % len(data))
     return data
@@ -293,7 +308,7 @@ def request(url, headers={}):
         r = requests.get(url, headers=headers)
         data = r.content
     except:
-        data = r.content   
+        data = r.content
 
     debug('len(data) %s' % len(data))
     return data
@@ -304,12 +319,12 @@ def post(url, data, headers={}):
     #req.add_header('User-Agent', UA)
     import requests
     if 'User-Agent' not in headers:
-        headers['User-Agent']= UA    
+        headers['User-Agent']= UA
     try:
         r = requests.post(url, data=postdata,headers=headers)
         data = r.content
     except urllib2.HTTPError, error:
-        data = r.content   
+        data = r.content
     return data
 
 def post0(url, data, headers={}):
@@ -321,7 +336,7 @@ def post0(url, data, headers={}):
         data = response.read()
         response.close()
     except urllib2.HTTPError, error:
-        data = error.read()    
+        data = error.read()
     return data
 
 
@@ -546,7 +561,7 @@ if __name__ == "__main__":
     urlp = streamproxy_encode(url,headers)
     print urlp
     player(urlp)
-    
+
     pass
-    
+