New upstream version 3.11.7

* небольшие правки HLS рестримера

Author: partizand

ptv3/addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="ptv3"
        name="Пазл Сервер 3.0"
-       version="3.11.5"
+       version="3.11.7"
        provider-name="TDW">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

ptv3/core.py

@@ -51,10 +51,11 @@ def __init__(self, param):
 
 	def run(self):
 		Lu=get_stream(self.param['url'])
-		try:r=test_url(Lu[0])
-		except: r='404'
-		if r!='404': update_Lt(Lu, self.param['n'], self.param['url'])
-		else:		 update_Lt([], self.param['n'], self.param['url'])
+		#try:r=test_url(Lu[0])
+		#except: r='404'
+		#if r!='404': update_Lt(Lu, self.param['n'], self.param['url'])
+		#else:		 update_Lt([], self.param['n'], self.param['url'])
+		update_Lt(Lu, self.param['n'], self.param['url'])
 
 
 def create_thread(param):
@@ -186,6 +187,7 @@ def inBL(url):
 def test_url(url):
 	if 'udp://' in url:  return '200'
 	if 'rtmp://' in url: return '200'
+	if '/restream/' in url: return '200'
 
 	if url in BanCashe: return 404
 
@@ -1240,10 +1242,10 @@ def streams(id):
 			sn+=1
 			create_thread({'url':url, 'n':sn})
 
-		for t in range(60):
+		for t in range(4):
 			if len(Lthread) == len(urls): break
 			#if len(Lthread) > 1 and fplay =='true': break
-			time.sleep(0.31)
+			time.sleep(0.5)
 
 		for rst in Lthread:
 			Lst=rst['L']

ptv3/hls.py

@@ -18,6 +18,29 @@ def get_UA(url):
 		if i[0] in url: return i[1]
 	return 'Opera/10.60 (X11; openSUSE 11.3/Linux i686; U; ru) Presto/2.6.30 Version/10.60'
 
+def CRC32(buf):
+		import binascii
+		buf = (binascii.crc32(buf) & 0xFFFFFFFF)
+		return str("%08X" % buf)
+
+def save_cache(url, cache):
+	try:
+		fp=os.path.join(os.getcwd(), 'cache2', CRC32(url))
+		fl = open(fp, "wb")
+		fl.write(cache)
+		fl.close()
+	except: pass
+
+def get_cache(url):
+	try:
+		fp=os.path.join(os.getcwd(), 'cache2', CRC32(url))
+		fl = open(fp, "r")
+		DT = fl.read()
+		fl.close()
+		return DT
+	except:
+		return None
+
 class HLS():
 	def __init__(self, hls_url, header='', list_index = -1):
 		self.header = header
@@ -35,6 +58,8 @@ def __init__(self, hls_url, header='', list_index = -1):
 		self.br_n = 0
 
 	def GET(self, url, Referer = 'http://ya.ru/'):
+		#cache=get_cache(url)
+		#if cache!=None: return cache
 		try:
 			urllib2.install_opener(urllib2.build_opener()) 
 			req = urllib2.Request(url)
@@ -47,6 +72,7 @@ def GET(self, url, Referer = 'http://ya.ru/'):
 			response = urllib2.urlopen(req, timeout=3)
 			data=response.read()
 			response.close()
+			#save_cache(url, data)
 			return data
 		except:
 			return None
@@ -133,11 +159,11 @@ def get_data2(self):
 		else:
 			head = self.hls_head
 
-		print head
+		#print head
 		if L[self.hls_n][:4]!='http': data_url = head+L[self.hls_n]
 		else:						  data_url = L[self.hls_n]
 
-		print data_url#[-20:]
+		print data_url[-20:]
 		if data_url not in self.hls_complit:
 
 			data = self.GET(data_url, head)

ptv3/server.py

@@ -17,6 +17,7 @@
 #import epg
 import hls
 
+HLSBUF={}
 
 buf = []
 trd = [0]
@@ -80,7 +81,7 @@ def get_ip():
 ip = get_ip()
 
 
-print('----- Starting PTV3 0.11.5 -----')
+print('----- Starting PTV3 0.11.7 -----')
 print('HELP:     http://'+ip+':'+str(port))
 print('PLAYLIST: http://'+ip+':'+str(port)+'/playlist')
 trigger = True
@@ -1226,16 +1227,16 @@ def do_GET(self):
 			st = 0
 			while trigger:
 					n+=1
-					print n
-					part=HLS.get_data2()
+					#print n
+					part=HLS.get_data()
 					if part !=None: 
 						self.wfile.write(part)
 						er=0
 						st=1
 					else:
-						if er>3 and st==0: break
-						if er>1000: break
 						er+=1
+						if st==0: break
+						if er>1000: break
 						time.sleep(0.5)
 						part = 'None'
 			print '== HLS END =='