playstreamproxy kļūdas labojums

ContentSources.py

@@ -181,7 +181,8 @@ if __name__ == "__main__":
             if streams:
                 util.play_video(streams)
             else:
-                print "**No stream to play - %s "%(cur2[1])
+                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])

PlayStream.py

@@ -304,7 +304,6 @@ class PSPlayer(MoviePlayer):
             if self.subtitle_window.shown:
                 self.subtitle_window.hide()
 
-
         # 	struct SubtitleTrack
         #	int type;
         #	int pid;

changelog.md

@@ -1,4 +1,7 @@
 
+**0.5u** (19.01.2016):
+- kļūdas labojums atverot hqq u.c. strīmus
+
 **0.5t** (19.01.2016):
 - Konfigurācijas logs, tmp folder uzdošana, opcija notīrīt tmp folderi pie iziešanas
 - Sīki labojumi

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.5t
+    set ver=0.5v
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF
@@ -40,7 +40,7 @@ VideoDownload.py
 enigma2_api.py
 resolver.py
 util.py
-streamproxy.py
+playstreamproxy.py
 offline.mp4
 demjson.py
 locale\*.*

playstreamproxy.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-""" 
+"""
 StreamProxy daemon (based on Livestream daemon)
 Ensures persistent cookies, User-Agents and others tricks to play protected HLS/DASH streams
 """
@@ -41,10 +41,10 @@ class StreamHandler(BaseHTTPRequestHandler):
         SPLIT_CODE = "%7E"
         EQ_CODE = "%3D"
         COL_CODE = "%3A"
-        
+
         p = self.path.split("~")
         url = urllib.unquote(p[0][1:])
-        url = url.replace(COL_CODE, ":")       
+        url = url.replace(COL_CODE, ":")
         headers = headers2dict("""
         User-Agent: Mozilla/5.0 (iPhone; CPU iPhone OS 8_0_2 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12A366 Safari/600.1.4
         """)
@@ -56,7 +56,7 @@ class StreamHandler(BaseHTTPRequestHandler):
             self.fetch_url2(self.wfile, url, headers)
         except Exception as e:
             print "Got Exception: ", str(e)
-        
+
     def fetch_offline(self,wfile):
         self.send_response(200)
         self.send_header("Server", "StreamProxy")
@@ -64,18 +64,18 @@ class StreamHandler(BaseHTTPRequestHandler):
         self.end_headers()
         self.wfile.write(open("offline.mp4", "rb").read())
         self.wfile.close()
-        
-    
+
+
     def fetch_url2(self, wfile, url, headers):
         if DEBUG: print "\n***********************************************************"
         self.log_message("fetch_url: %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()
             #cj = cookielib.CookieJar()
-            #sessions[base_url] = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))    
+            #sessions[base_url] = urllib2.build_opener(urllib2.HTTPCookieProcessor(cj))
         else:
             pass
         ses = sessions[base_url]
@@ -90,7 +90,7 @@ class StreamHandler(BaseHTTPRequestHandler):
         code = r.status_code #r.status_code
         if DEBUG: print "**Response:", code #r.status_code
         if DEBUG: print "**Response headers: "
-        for h in r.headers: 
+        for h in r.headers:
             if DEBUG: print h,"=",r.headers[h]
         self.send_response(code)
         if DEBUG: print "**Return headers:"
@@ -102,7 +102,7 @@ class StreamHandler(BaseHTTPRequestHandler):
             self.send_header(h, r.headers[h])
             if DEBUG:print h,"=",r.headers[h]
         self.end_headers()
-        
+
         CHUNK_SIZE = 4 * 1024
         if code == 200:
             #while True:
@@ -115,20 +115,20 @@ class StreamHandler(BaseHTTPRequestHandler):
             for chunk in r.iter_content(1024):
                 try:
                     #print "#",
-                    wfile.write(chunk) 
+                    wfile.write(chunk)
                 except Exception as e:
                     print "Exception: ", str(e)
                     return
             if DEBUG: print "  = file downloaded = "
             time.sleep(2)
             #self.wfile.close()
-            
-            
+
+
         else:
             print code
             self.fetch_offline(wfile)
             pass
-  
+
 class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
     """Handle requests in a separate thread."""
 
@@ -156,33 +156,33 @@ class Daemon:
 
     def daemonize(self):
         """
-        do the UNIX double-fork magic, see Stevens' "Advanced 
+        do the UNIX double-fork magic, see Stevens' "Advanced
         Programming in the UNIX Environment" for details (ISBN 0201563177)
         http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
         """
-        try: 
-            pid = os.fork() 
+        try:
+            pid = os.fork()
             if pid > 0:
                 # exit first parent
-                sys.exit(0) 
-        except OSError, e: 
+                sys.exit(0)
+        except OSError, e:
             sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
             sys.exit(1)
 
         # decouple from parent environment
-        os.chdir("/") 
-        os.setsid() 
-        os.umask(0) 
+        os.chdir("/")
+        os.setsid()
+        os.umask(0)
 
         # do second fork
-        try: 
-            pid = os.fork() 
+        try:
+            pid = os.fork()
             if pid > 0:
                 # exit from second parent
-                sys.exit(0) 
-        except OSError, e: 
+                sys.exit(0)
+        except OSError, e:
             sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
-            sys.exit(1) 
+            sys.exit(1)
 
         # redirect standard file descriptors
         sys.stdout.flush()
@@ -240,7 +240,7 @@ class Daemon:
             sys.stderr.write(message % self.pidfile)
             return # not an error in a restart
 
-        # Try killing the daemon process	
+        # Try killing the daemon process
         try:
             while 1:
                 os.kill(pid, SIGTERM)
@@ -272,7 +272,7 @@ class ProxyDaemon(Daemon):
         start()
 
 if __name__ == "__main__":
-    daemon = ProxyDaemon("/var/run/streamproxy.pid")
+    daemon = ProxyDaemon("/var/run/playstreamproxy.pid")
     if len(sys.argv) == 2:
         if "start" == sys.argv[1]:
             daemon.start()

resolver.py

@@ -71,7 +71,7 @@ def resolve(url):
     value = resolver.resolve(url)
     if not value:
         return []
-    default = item()
+    default = util.item()
     for i in value:
         i["resolver"] = resolver.__name__
         if 'name' not in i.keys():