New upstream 3.13.2

Author: partizand

changelog

@@ -1,3 +1,7 @@
+0.13.2 - https://cloud.mail.ru/public/KWYf/B3A9JzFzp
+- tvtvtv.ru
+- поиск логотипов по источникам каналов 
+
 0.12.9 https://cloud.mail.ru/public/5xra/L6UgXJzLa
 - добавил tvin.su
 - если все потоки для канала заблокированы. канал не отображается (после перезапуска) 

ptv3/DBcnl.py

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

ptv3/DefGR.py

@@ -674,6 +674,24 @@ def get_all_channeles():
 	#print '==get_all_channeles end=='
 	return L
 
+def get_all_picons(id):
+	print '==get_all_picons=='
+	L=[]
+	LL=[]
+	for i in Lserv:
+				serv_id=str(int(i[1:3]))
+				print serv_id
+				try:Ls=get_cahe_list(serv_id)
+				except:Ls=[]
+				if Ls==[]:
+					utm = get_cahe_time(serv_id)
+					if time.time()-utm > 600:
+						try: Ls=upd_canals_db(i)
+						except: Ls=[]
+				L.extend(Ls)
+	for i in L:
+		if get_ID(i['title']) == id and i['img']!='': LL.append(i['img'])
+	return LL
 
 def get_all_serv(id):
 	L=[]
@@ -922,8 +940,8 @@ def get_stream(url):
 					Lcurl = serv.Streams(url)
 					Lpurl = []
 					try:
-						for curl in Lcurl:
-							if 'zabava' in curl or 'vrzh-htlive' in curl or 'yandex' in curl or 'ucom.am' in curl or '/udp/' in curl or 'peers.tv' in curl:
+						for curl in Lcurl: 
+							if 'zabava' in curl or 'vrzh-htlive' in curl or 'yandex' in curl or 'ucom.am' in curl or '/udp/' in curl or 'peers.tv' in curl or '193.124.177.175' in curl:
 								import base64
 								ip = settings.get('ip')
 								curl= 'http://'+ip+':'+str(port)+'/restream/'+base64.b64encode(curl)

ptv3/addon.xml

@@ -13,7 +13,7 @@ def mfind(t,s,e):
 	return r2
 
 def get_UA(url):
-	L=[['peers.tv','DuneHD/1.0.3'],]
+	L=[['peers.tv','DuneHD/1.0.3'],['193.124.177.175','TV+Android/1.1.5.2 (Linux;Android 7.1.1) ExoPlayerLib/2.9.1']]
 	for i in L:
 		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'
@@ -41,6 +41,15 @@ def get_cache(url):
 	except:
 		return None
 
+def normal(data_url):
+	url=''
+	L=data_url.split('/')
+	L2=[]
+	for i in L:
+		if i not in L2: url+=i+'/'
+		L2.append(i)
+	return url[:-1]
+
 class HLS():
 	def __init__(self, hls_url, header='', list_index = -1):
 		self.header = header
@@ -133,7 +142,7 @@ def get_list(self, url):
 
 	def get_head(self, url=''):
 		if url=='': url=self.hls_url
-		if 'peers.tv/playlist' in url or '178.162' in url:#/var
+		if 'peers.tv/playlist' in url :#or '193.124.177.175' in url 178.162
 			t1 = url[:url.find('://')+3]
 			t2 = mfind(url, '://', '/')
 			return t1+t2
@@ -159,11 +168,13 @@ def get_data2(self):
 		else:
 			head = self.hls_head
 
-		#print head
+		print head
 		#print L
 		if L[self.hls_n][:4]!='http': data_url = head+L[self.hls_n]
 		else:						  data_url = L[self.hls_n]
 
+		data_url = normal(data_url)
+		
 		print data_url#[-20:]
 		if data_url not in self.hls_complit:
 
@@ -196,6 +207,32 @@ def get_data(self):
 		self.buf=self.buf[block_sz:]
 		return data
 
+	def get_data_buf(self):
+		block_sz = 8192
+		buf_sz   = 1024000
+		try: 
+			szb = len(self.buf)
+			if szb < buf_sz+block_sz: print szb
+		except: print 0
+		if self.buf == None:
+			self.buf = self.get_data2()
+			if self.buf == None: return None
+		
+		elif len(self.buf)< buf_sz and len(self.buf)> block_sz:
+			dt = self.get_data2()
+			if dt!=None:
+				self.buf = self.buf+dt
+		
+		elif len(self.buf)< block_sz:
+			dt = self.get_data2()
+			if dt!=None:
+				self.buf = self.buf+dt
+			else: return None
+		
+		data = self.buf[:block_sz]
+		self.buf=self.buf[block_sz:]
+		return data
+
 #sHLS = HLS('https://strm.yandex.ru/kal/fashiontv/fashiontv0_169_1080p.json/index-v1-a1.m3u8?partner_id=270171&target_ref=https%3A%2F%2Fyastatic.net&uuid=42ee5f579c38ea04a6d92ccefdbeed99&vsid=ojhxcxb2wxf48pv&redundant=5')
 #sHLS.get_data()
 #sHLS.get_data()

ptv3/core.py

@@ -1,3 +1,3 @@
 [
 ]
-udata=1569689112.05
+udata=1575617096.92

ptv3/hls.py

@@ -1,3 +1,3 @@
 [
 ]
-udata=1563360228.88
+udata=1575617096.3

ptv3/serv/15.cl

@@ -1,3 +1,3 @@
 [
 ]
-udata=1563360218.41
+udata=1575617096.31

ptv3/serv/19.cl

@@ -0,0 +1,3 @@
+[
+]
+udata=1575617096.31

ptv3/serv/26.cl

@@ -1,2 +1,3 @@
-[]
-udata=1573381993.66
+[
+]
+udata=1575617096.32