0.6b

ContentSources.py

@@ -7,7 +7,7 @@
 #
 
 import sys,os,re
-import glob
+import glob, traceback
 sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
 from  sources.SourceBase import stream_type
 import util
@@ -105,6 +105,12 @@ class ContentSources(object):
                 for k in s:
                     if isinstance(s[k],unicode):
                         s[k] = s[k].encode("utf8")
+                if not "resolver" in s:
+                    s["resolver"] = stream
+                if not "surl" in s or not s["surl"]:
+                    s["surl"] = data
+                if not "nfo" in s:
+                    s["nfo"]={"tvshow":{"title":s["title"],"thumb":s["img"],"plot":s["desc"]}}
             return streams
         else:
             return []
@@ -155,7 +161,7 @@ if __name__ == "__main__":
     while True:
         print
         for i,item in enumerate(content):
-            s = "%i: %s - %s %s %s "%(i+1,item[0],item[1],item[2],item[3])
+            s = "%i: %s - %s %s %s "%(i,item[0],item[1],item[2],item[3])
             print s #.encode(sys.stdout.encoding,"replace")
 
         while True:
@@ -170,7 +176,7 @@ if __name__ == "__main__":
             except:
                 print "Not number!"
         if exit_loop: break
-        cur2 = content[n-1]
+        cur2 = content[n]
 
         data0 = cur2[1].split("::")[1] if "::" in cur2[1] else cur2[1]
         if not data0:
@@ -188,7 +194,8 @@ if __name__ == "__main__":
                 try:
                     streams = sources.get_streams(cur2[1])
                 except Exception as e:
-                    print str(e)
+                    print unicode(e)
+                    traceback.print_exc()
                     streams = []
             if streams:
                 util.play_video(streams)
@@ -208,7 +215,7 @@ if __name__ == "__main__":
         try:
             content = sources.get_content(cur[1])
         except Exception as e:
-            print str(e)
+            print unicode(e)
             raw_input("Continue?")
 
 

PlayStream.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # coding=utf8
 #
-#
 # This file is part of PlayStream - enigma2 plugin to play video streams from various sources
 # Copyright (c) 2016 ivars777 (ivars777@gmail.com)
 # Distributed under the GNU GPL v3. For full terms see http://www.gnu.org/licenses/gpl-3.0.en.html
@@ -12,51 +11,47 @@ import os,time,sys,os,os.path
 import datetime,re
 import urllib2
 
+from Plugins.Plugin import PluginDescriptor
 from enigma import ePicLoad, eServiceReference, eTimer, getDesktop
-from Components.ActionMap import ActionMap, HelpableActionMap
+from Screens.Screen import Screen
 from Screens.InfoBarGenerics import InfoBarShowHide
+from Screens.InfoBar import MoviePlayer
+from Screens.MessageBox import MessageBox
+from Screens.LocationBox import LocationBox
+from Screens.ChoiceBox import ChoiceBox
+from Screens.VirtualKeyBoard import VirtualKeyBoard
+#from Screens.InputBox import InputBox
 from Components.AVSwitch import AVSwitch
+from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.Label import Label
+from Components.Input import Input
 from Components.MenuList import MenuList
 from Components.Pixmap import Pixmap
 from Components.Sources.List import List
 from Components.Sources.StaticText import StaticText
 from Components.Button import Button
-from Plugins.Plugin import PluginDescriptor
-from Screens.InfoBar import MoviePlayer
-from Screens.MessageBox import MessageBox
+from Components.Task import job_manager
+from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations, ConfigDirectory, ConfigSet, ConfigYesNo, ConfigSelection, getConfigListEntry, ConfigSelectionNumber, ConfigNumber
+from Components.ConfigList import ConfigListScreen
 from Tools import Notifications
-from Screens.LocationBox import LocationBox
-#from Screens.InputBox import InputBox
-from Screens.ChoiceBox import ChoiceBox
-from Screens.VirtualKeyBoard import VirtualKeyBoard
-from Components.Input import Input
-from Screens.Screen import Screen
 from Tools.BoundFunction import boundFunction
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 from Tools.LoadPixmap import LoadPixmap
 from twisted.web.client import downloadPage,defer,reactor
-from Components.Task import job_manager
-from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations, ConfigDirectory, ConfigSet, ConfigYesNo, ConfigSelection, getConfigListEntry, ConfigSelectionNumber
-
 
 import ContentSources
 import util
 from VideoDownload import downloadJob, HLSDownloadJob,VideoDownloadList
 #import enigma2_api
-e2 = None
 
+e2 = None
 ##########################################################################
-from Components.config import config, ConfigSubsection, ConfigYesNo, getConfigListEntry, \
-     ConfigSelection, ConfigNumber, ConfigDirectory,ConfigText
-from Components.ConfigList import ConfigListScreen
-from Screens.LocationBox import LocationBox
-
 config.plugins.playstream = ConfigSubsection()
 config.plugins.playstream.locations = ConfigLocations(default=["/media/hdd/movie/"])
 config.plugins.playstream.download_dir = ConfigDirectory(default="/media/hdd/movie/")
 config.plugins.playstream.tmp_dir = ConfigDirectory(default="/tmp/playstream/")
 config.plugins.playstream.streamproxy_start = ConfigYesNo(default = True)
+config.plugins.playstream.overwrite_download = ConfigYesNo(default = False)
 #config.plugins.playstream.size = ConfigSelection({"400x240":"400x240","220x132":"220x132","100x60":"100x60"}, default="220x132")
 config.plugins.playstream.clear_tmp = ConfigYesNo(default = True)
 
@@ -83,9 +78,11 @@ class ConfigScreen(ConfigListScreen,Screen):
         cfg = config.plugins.playstream
         self.list = [
             getConfigListEntry(_("Download folder"), cfg.download_dir),
+            getConfigListEntry(_("Overwrite download video"), cfg.overwrite_download),
             getConfigListEntry(_("TMP folder"), cfg.tmp_dir),
             getConfigListEntry(_("Clear tmp folder on exit"), cfg.clear_tmp),
             getConfigListEntry(_("Start playstreamproxy"), cfg.streamproxy_start),
+
         ]
         ConfigListScreen.__init__(self, self.list, session = self.session)
         self["key_red"] = Button(_("Cancel"))
@@ -110,14 +107,14 @@ class ConfigScreen(ConfigListScreen,Screen):
     def ok(self):
         if self["config"].getCurrent()[1] == config.plugins.playstream.download_dir:
             folder = config.plugins.playstream.download_dir.value
-            #self.session.openWithCallback(self.select_download_dir, LocationBox,"Select Folder")
-            self.session.openWithCallback(self.select_download_dir, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
+            #self.session.openWithCallback(self.cb_download_dir, LocationBox,"Select Folder")
+            self.session.openWithCallback(self.cb_download_dir, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
         elif self["config"].getCurrent()[1] == config.plugins.playstream.tmp_dir:
             self.session.openWithCallback(self.select_tmp_dir, LocationBox,"Select tmp folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
         else:
             self.save()
 
-    def select_download_dir(self, folder, select=None):
+    def cb_download_dir(self, folder, select=None):
         if not folder:
             return
         print "Folder selected - %s"%folder
@@ -160,10 +157,10 @@ def make_service(stream):
     service_type = 4097
     if re.search("\.ts$",url.split("?")[0],re.IGNORECASE):
         service_type = 1
-    if "resolver" in stream and stream["resolver"] in ("hqq","viaplay"):
+    if "resolver" in stream and stream["resolver"] in ("hqq","viaplay","filmas"):
         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
+        #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)
@@ -632,7 +629,7 @@ class MainScreen(Screen):
                 try:
                     self.session.open(PSPlayer, streams)
                 except Exception as e:
-                    self.msg2("Error launching player - " + str(e))
+                    self.msg("Error launching player - " + str(e))
                     return
             else:
                 self.msg("No stream found - %s"%(self.current[1]))
@@ -715,11 +712,15 @@ class MainScreen(Screen):
         ]
         if self.sources.is_video(self.current[1]):
             lst.extend([
-            ("Download video","download","Download video in background"),
+            ("Download video to default folder","download","Download video to default folder"),
+            ("Download video, ask folder","download2","Download video, ask download folder"),
+            ("Download video to subfolder, ask parent folder","download3","Download video to subfolder, ask download folder"),
+
             ])
         else:
             lst.extend([
-            ("Download videos in folder","download","Download videos in folder (if any)"),
+            ("Download list to default folder","download","Download videos in list (if any)"),
+            ("Download list, ask folder","download2","Download videos in list (if any), ask download folder"),
             ])
         if "config::" in self.cur_menu[1]:
             lst.extend([
@@ -735,6 +736,7 @@ class MainScreen(Screen):
         #print "item_menu_selected",answer
         if not answer:
             return
+        self.answer = answer[1]
 
         if answer[1] == "info":
             self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)
@@ -748,33 +750,22 @@ class MainScreen(Screen):
 
         elif answer[1] == "favorites":
             lists = self.config.get_lists()
-            lists2 = [(l,l) for l in lists]
+            lists2 = [(self.config.get_title(l),l) for l in lists]
+            print lists2
             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]):
-                #self.msg("Can not download listst (yet) - %s"%(current[1]))
-                n = 0
-                for current2 in self.sources.get_content(current[1]):
-                    if self.sources.is_video(current2[1]):
-                        n += 1
-                        self.download_video(current2)
-                if n>0:
-                    self.msg("%s videos download started"%n)
-                else:
-                    self.msg("No videos to download")
-            else:
-                if self.download_video(current):
-                    self.msg("Video download started")
+        elif answer[1] in ("download2","download3"):  # ask download folder before
+            self.session.openWithCallback(self.download_prepare, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
 
+        elif answer[1] == 'download':
+            self.download_prepare(config.plugins.playstream.download_dir.value)
 
         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.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
+            self.session.openWithCallback(self.cb_download_dir, LocationBox,"Select download folder","",config.plugins.playstream.download_dir.value,config.plugins.playstream.locations,False,"Select folder",None,True,True)
 
         elif answer[1] == "delete":
             lst = self.cur_menu[1].replace("config::","")
@@ -793,7 +784,31 @@ class MainScreen(Screen):
             pass #TODO
         return
 
-    def select_download_dir(self, downloadDir, select=None):
+    def download_prepare(self, download_dir=""):
+        current = self.current
+        if not download_dir:
+            return
+            #download_dir = config.plugins.playstream.download_dir.value
+        title = re.sub("\[.+?\]","", util.make_fname(current[0])).strip()
+        download_dir2 = os.path.join(download_dir, title)
+        if not self.sources.is_video(current[1]):
+            #self.msg("Can not download listst (yet) - %s"%(current[1]))
+            n = 0
+            for current2 in self.sources.get_content(current[1]):
+                if self.sources.is_video(current2[1]):
+                    n += 1
+                    self.download_video(current2,download_dir2)
+            if n>0:
+                self.msg("%s videos download started to %s"%(n,download_dir2))
+            else:
+                self.msg("No videos to download")
+        else:
+            if self.answer == "download":
+                download_dir2 = download_dir
+            if self.download_video(current,download_dir2):
+                self.msg("Video download started to %s"%download_dir2)
+
+    def cb_download_dir(self, downloadDir, select=None):
         if not downloadDir:
             return
         print "Folder selected - %s"%downloadDir
@@ -805,7 +820,7 @@ class MainScreen(Screen):
     def download_list(self):
         self.session.open(VideoDownloadList)
 
-    def download_video(self,current):
+    def download_video(self,current, download_dir=""):
         if self.sources.stream_type(current[1]):
             stream = util.item()
             stream["url"] = current[1]
@@ -831,9 +846,9 @@ class MainScreen(Screen):
         else:
             stream = streams[0]
         stream = util.stream_change(stream)
-        return self.download_stream(stream)
+        return self.download_stream(stream, download_dir)
 
-    def download_stream(self,stream):
+    def download_stream(self,stream,download_dir=""):
         print "download stream",stream
         #self.msg("Start downloading..")
         self.stream = stream
@@ -846,16 +861,31 @@ class MainScreen(Screen):
         title = self.stream["name"].strip()
         url = self.stream["url"]
         stream_type = self.stream["type"] #self.sources.stream_type(stream["url"])
-        downloadDir = config.plugins.playstream.download_dir.value
+        downloadDir = config.plugins.playstream.download_dir.value if not download_dir else download_dir
         if not os.path.exists(downloadDir):
-            print 'Sorry, download directory "%s" not exist!\nPlease specify in the settings existing directory'%downloadDir
-            self.msg0(_('Sorry, download directory "%s" not exist!\nPlease specify in the settings existing directory'%downloadDir))
-            return
-        fname0 = re.sub("[/\n\r\t,:]"," ",title)
-        fname0 = re.sub("['""]","",fname0)
+            try:
+                os.mkdir(downloadDir)
+            except Exception as e:
+                print 'Error creating download directory "%s"!\nPlease specify in the settings existing directory\n%s'%(downloadDir,str(e))
+                self.msg('Error creating download directory "%s"!\nPlease specify in the settings existing directory\n%s'%(downloadDir,str(e)))
+                return
+        fname0 = util.make_fname(title)
         fname = fname0 +".mp4"
         outputfile = os.path.join(downloadDir, fname)
         #print "Trying to download - ", current
+        if self.stream["img"]:
+            try:
+                thumb = urllib2.urlopen(stream["img"]).read()
+            except:
+                thumb = ""
+            if thumb:
+                imgext = ".jpg"
+                m = re.search("(\.\w{3})$",stream["img"])
+                if m:
+                    imgext = m.group(1)
+                imgfile = os.path.join(downloadDir,fname0+imgext)
+                with open(imgfile,"wb") as f:
+                    f.write(thumb)
         if self.stream["subs"]:
             suburl = self.stream["subs"][0]["url"]
             print "\n**Download subtitles %s - %s"%(title,suburl)
@@ -870,8 +900,17 @@ class MainScreen(Screen):
                     f.write(subs)
             else:
                 print "\n Error downloading subtitle %s"%suburl
-
-        if os.path.exists(outputfile):
+        if "nfo" in self.stream and self.stream["nfo"]:
+            nfofile = subfile = os.path.join(downloadDir,fname0+".nfo")
+            with open(nfofile,"w") as f:
+                nfo_type,nfo = next(self.stream["nfo"].iteritems())
+                f.write("<%s>\n"%nfo_type.encode("utf8"))
+                for k,v in nfo.iteritems():
+                    if isinstance(v,unicode): v = v.encode("utf8")
+                    f.write("    <%s>%s</%s>\n"%(k.encode("utf8"), v, k.encode("utf8")))
+                f.write("</%s>\n"%nfo_type.encode("utf8"))
+        overwrite = config.plugins.playstream.overwrite_download.value
+        if not overwrite and os.path.exists(outputfile):
             self.msg( _('Sorry, this file already exists:\n%s') % outputfile)
             return False
             #os.remove(outputfile)

changelog.md

@@ -1,4 +1,8 @@
-**0.6a** (12.02.2016):
+**0.6b** (05.03.2017)
+- uzlabota lejupielāde (foldera paprasišana, lejupielāde apakšfolderi u.c.)
+- .nfo un .jpg failu veidošana pie lejupielādes (jēdzigs .nfo pagaidam tikai iPlayer)
+
+**0.6a** (12.02.2017):
 - kombinētā versija ar Kodi, salabots, lai iet kopā (funkcionali nekas jauns)
 
 **0.5y** (11.02.2016):

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.6a
+    set ver=0.6b
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF

playstreamproxy.py

@@ -8,6 +8,7 @@ import sys
 import time
 import atexit
 import re
+import binascii
 
 from signal import SIGTERM
 
@@ -22,7 +23,7 @@ requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
 HOST_NAME = ""
 PORT_NUMBER = 88
-DEBUG = True
+DEBUG = False
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 sessions = {}
@@ -41,7 +42,7 @@ class StreamHandler(BaseHTTPRequestHandler):
         SPLIT_CODE = "%7E"
         EQ_CODE = "%3D"
         COL_CODE = "%3A"
-
+        self.log_message("get_url: \n%s", self.path)
         p = self.path.split("~")
         url = urllib.unquote(p[0][1:])
         url = url.replace(COL_CODE, ":")
@@ -68,17 +69,21 @@ class StreamHandler(BaseHTTPRequestHandler):
 
     def fetch_url2(self, wfile, url, headers):
         if DEBUG: print "\n***********************************************************"
-        self.log_message("fetch_url: %s", url)
+        self.log_message("fetch_url: \n%s", url)
         #self.log_message("headers: %s", headers)
 
         base_url = "/".join(url.split("/")[0:-1])
         if base_url not in sessions:
-            sessions[base_url] = requests.Session()
+            sessions[base_url]={}
+            sessions[base_url]["session"] = requests.Session()
+            sessions[base_url]["key"] = binascii.a2b_hex(headers["key"]) if "key" in headers and headers["key"] else None
             #cj = cookielib.CookieJar()
             #sessions[base_url] = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
         else:
-            pass
-        ses = sessions[base_url]
+            if "key" in headers and headers["key"]: sessions[base_url]["key"] = binascii.a2b_hex(headers["key"])
+        ses = sessions[base_url]["session"]
+        key = sessions[base_url]["key"]
+
         if DEBUG: print "**Request headers: "
         ses.headers.update(headers)
         #ses.addheaders=[]
@@ -93,41 +98,69 @@ class StreamHandler(BaseHTTPRequestHandler):
         for h in r.headers:
             if DEBUG: print h,"=",r.headers[h]
         self.send_response(code)
+
+        print code
+        if code <> 200:
+            self.fetch_offline(wfile)
+            return
+
         if DEBUG: print "**Return headers:"
+        headers2 = {}
         for h in r.headers:
-            if h.lower() in ("user-agent","server"):continue
-            if h.lower()=="connection":
-                if DEBUG: print h," skipped"
+            if h.lower() in ("user-agent","server","transfer-encoding","content-encoding","connection"):
+                if DEBUG: print h," - skipped"
                 continue
-            self.send_header(h, r.headers[h])
-            if DEBUG:print h,"=",r.headers[h]
-        self.end_headers()
+            else:
+                headers2[h] = r.headers[h]
+                if DEBUG:print h,"=",r.headers[h]
+
+        # Content-Type: application/vnd.apple.mpegurl
+        if r.headers["Content-Type"] == "application/vnd.apple.mpegurl" and key:
+            content = r.content
+            content = r.content.replace(base_url+"/","")
+            content = re.sub("#EXT-X-KEY:METHOD=AES-128.+\n", "", content, 0, re.IGNORECASE | re.MULTILINE)
+            headers2["Content-Length"] = "%s"%len(content)
+            self.send_headers(headers2)
+            wfile.write(content)
+
+        # Content-Type: video/MP2T
+        elif r.headers["Content-Type"] == "video/MP2T" and key:
+            content = r.content
+            from Crypto.Cipher import AES
+            iv = content[:16]
+            d = AES.new(key, AES.MODE_CBC, iv)
+            content = d.decrypt(content[16:])
+            headers2["Content-Length"] = "%s"%len(content)
+            self.send_headers(headers2)
+            wfile.write(content)
 
-        CHUNK_SIZE = 4 * 1024
-        if code == 200:
-            #while True:
-                #chunk = r.read(CHUNK_SIZE)
-                #if not chunk:
-                    #break
-                #wfile.write(chunk)
-            #pass
-            #wfile.close()
-            for chunk in r.iter_content(1024):
-                try:
-                    #print "#",
-                    wfile.write(chunk)
-                except Exception as e:
-                    print "Exception: ", str(e)
-                    return
-            if DEBUG: print "  = file downloaded = "
-            time.sleep(2)
-            #self.wfile.close()
+        else:
+            self.send_headers(headers2)
+            CHUNK_SIZE = 4 * 1024
+            if code == 200:
+                #while True:
+                    #chunk = r.read(CHUNK_SIZE)
+                    #if not chunk:
+                        #break
+                    #wfile.write(chunk)
+                #pass
+                #wfile.close()
+                for chunk in r.iter_content(1024):
+                    try:
+                        #print "#",
+                        wfile.write(chunk)
+                    except Exception as e:
+                        print "Exception: ", str(e)
+                        return
+                if DEBUG: print "  = file downloaded = "
+                time.sleep(1)
+        self.wfile.close()
 
+    def send_headers(self,headers):
+        for h in headers:
+            self.send_header(h, headers[h])
+        self.end_headers()
 
-        else:
-            print code
-            self.fetch_offline(wfile)
-            pass
 
 class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
     """Handle requests in a separate thread."""

plugin.py

@@ -1,6 +1,7 @@
 from Plugins.Plugin import PluginDescriptor
 import PlayStream
 from . import _
+import traceback
 
 def main(session, **kwargs):
     try:
@@ -8,6 +9,7 @@ def main(session, **kwargs):
         session.open(PlayStream.MainScreen)
     except Exception as e:
         print "Error loading PlayStream - "+ e.message
+        traceback.print_exc()
 
 def menu(menuid, **kwargs):
     if menuid == "mainmenu":
@@ -17,5 +19,5 @@ def menu(menuid, **kwargs):
 def Plugins(**kwargs):
     return [
         PluginDescriptor(name = "Play Stream",description = _("Play online streams from various sources"),where = [PluginDescriptor.WHERE_PLUGINMENU,PluginDescriptor.WHERE_EXTENSIONSMENU], icon = "plugin.png", fnc = main),
-        PluginDescriptor(name="TV Play", description=_("Play online streams from various sources"), where = [PluginDescriptor.WHERE_MENU], fnc=menu)
+        PluginDescriptor(name="Play Stream", description=_("Play online streams from various sources"), where = [PluginDescriptor.WHERE_MENU], fnc=menu)
     ]

resolver.py

@@ -56,15 +56,11 @@ RESOLVERS = sorted(RESOLVERS, key=lambda m: -m.__priority__)
 def resolve(url):
     """
         resolves given url by asking all resolvers
-
-        returns None if no resolver advised to be able to resolve this url
-        returns False if resolver did his job, but did not return any value (thus failed)
         returns Array of resolved objects in positive usecase
     """
     url = util.decode_html(url)
     util.info('Resolving ' + url)
     resolver = _get_resolver(url)
-    value = None
     if resolver is None:
         return []
     util.info('Using resolver \'%s\'' % str(resolver.__name__));
@@ -87,7 +83,7 @@ def resolve(url):
                 if "=" in h:
                     i["headers"][h.split("=")[0]] = h.split("=")[1]
 
-    return sorted(value, key=lambda i: i['quality'], reverse=True)
+    return sorted(value, key=lambda i: i['quality'], reverse=True) # TODO sorted by order?
 
 
 def _get_resolver(url):

resolvers/hdgo.py

@@ -30,6 +30,8 @@ except:
     import util
 import urllib2
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 #from aadecode import AADecoder
 
 if __name__ <> "__main__":
@@ -90,6 +92,6 @@ if __name__ == "__main__":
     util.play_video(streams)
 
 
-    #print streams[0]["url"]    
+    #print streams[0]["url"]
     #call([r"gst-launch-1.0.exe",'uri="%s""'%streams[0]["url"]])
     pass

resolvers/hqqresolver.py

@@ -24,6 +24,8 @@ except:
     sys.path.insert(0, os.sep.join(pp.split(os.sep)[:-1]))
     import util
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
 __author__ = 'ivars777'
 if __name__ <> "__main__":

resolvers/kapnob.py

@@ -29,6 +29,8 @@ except:
     sys.path.insert(0,os.sep.join(pp.split(os.sep)[:-1]))
     import util
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
 __author__ = 'ivars777'
 if __name__ <> "__main__":
@@ -89,6 +91,6 @@ if __name__ == "__main__":
         sys.exit()
     for s in streams:
         print s
-    print streams[0]["url"]    
+    print streams[0]["url"]
     util.play_video(streams)
     pass

resolvers/kodik.py

@@ -29,6 +29,8 @@ except:
     sys.path.insert(0,os.sep.join(pp.split(os.sep)[:-1]))
     import util
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 
 __author__ = 'ivars777'
 if __name__ <> "__main__":
@@ -90,6 +92,6 @@ if __name__ == "__main__":
         sys.exit()
     for s in streams:
         print s
-    print streams[0]["url"]    
+    print streams[0]["url"]
     util.play_video(streams)
     pass

resolvers/openload3.py

@@ -30,6 +30,8 @@ except:
     import util
 import urllib2
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 #from aadecode import AADecoder
 
 __author__ = 'Jose Riha/Lubomir Kucera'
@@ -49,7 +51,7 @@ def resolve(url):
         'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',
         'Accept-Encoding': 'none',
         'Accept-Language': 'en-US,en;q=0.8',
-        'Referer': url}  # 'Connection': 'keep-alive'    
+        'Referer': url}  # 'Connection': 'keep-alive'
 
     stream = util.item()
     m = re.search('https*://openload\.\w+/embed/([^/]+)', url)
@@ -68,11 +70,11 @@ def resolve(url):
     stream["url"] = res["url"]
     stream["name"]= res["url"]
     ### Retrieve subtitles ####
-    html = requests.get(url, headers=HTTP_HEADER).content 
+    html = requests.get(url, headers=HTTP_HEADER).content
     m = re.search('<track kind="captions" src="([^"]+)" srclang="([^"]+)" label="([^"]+)"', html)
     if m:
         stream["subs"] = m.group(1)
-        stream["lang"] = m.group(2)   
+        stream["lang"] = m.group(2)
 
     return [stream]
 
@@ -90,8 +92,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://openload.co/embed/rmNcP-0QopE/"
@@ -104,6 +106,6 @@ if __name__ == "__main__":
     for s in streams:
         print s
 
-    print streams[0]["url"]    
+    print streams[0]["url"]
     call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",streams[0]["url"]])
     pass

util.py

@@ -25,6 +25,8 @@ import datetime
 import traceback
 import cookielib
 import requests
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
+requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
 from htmlentitydefs import name2codepoint as n2cp
 import HTMLParser
 import StringIO
@@ -109,12 +111,14 @@ def player(url,title="",suburl="",headers={}):
         #'location="%s"'%url,
         #'!decodebin!autovideosink'
     ]
+    cmd3 = ["ffplay.exe",url]
     cmd = cmd1 if url.startswith("https") else cmd2
-    ret = call(cmd)
+    ret = call(cmd3)
     #if ret:
         #a = raw_input("*** Error, continue")
     return
 
+
 SPLIT_CHAR = "~"
 SPLIT_CODE = urllib.quote(SPLIT_CHAR)
 EQ_CODE = urllib.quote("=")
@@ -122,11 +126,18 @@ COL_CODE = urllib.quote(":")
 SPACE_CODE = urllib.quote(" ")
 PROXY_URL = "http://localhost:88/"
 
+
+def make_fname(title):
+    "Make file name from title"
+    title = title.strip()
+    fname0 = re.sub("[/\n\r\t,:]"," ",title)
+    fname0 = re.sub("['""]","",fname0)
+    return fname0
+
 def stream_change(stream):
     #return stream # TODO
-    if stream["surl"]:
-        if not re.search("https*://(hqq|goo.\gl)",stream["surl"]):
-            return stream
+    if "resolver" in stream and stream["resolver"] in ("viaplay","hqq","filmas") or \
+        "surl" in stream and re.search("https*://(hqq|goo.\gl)",stream["surl"]):
         stream["url"] = streamproxy_encode(stream["url"],stream["headers"])
         stream["headers"] = {}
         return stream
@@ -271,8 +282,9 @@ def ttaf2srt(s):
 
 
 def item():
+    """Default item content"""
     stream0 = {
-        'name': '',
+        'name': '', #
         'url': '',
         'quality': '?',
         'surl': '',
@@ -283,7 +295,8 @@ def item():
         "lang":"",
         "type":"",
         "resolver":"",
-        "order":0
+        "order":0,
+        "live":False
         }
     return stream0