stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

miglioria support.server e fix eurostreaming

Browse Source
This commit is contained in:
mac12m99
2021-01-13 18:23:52 +01:00
parent c97e1744e1
commit 391bce3905
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels.json
+1 -1
View File
@@ -17,7 +17,7 @@
"cinetecadibologna": "http://cinestore.cinetecadibologna.it", "cinetecadibologna": "http://cinestore.cinetecadibologna.it",
"dreamsub": "https://dreamsub.stream", "dreamsub": "https://dreamsub.stream",
"dsda": "https://www.dsda.press", "dsda": "https://www.dsda.press",
"eurostreaming": "https://eurostreaming.wiki", "eurostreaming": "https://eurostreaming.chat",
"fastsubita": "https://fastsubita.xyz", "fastsubita": "https://fastsubita.xyz",
"filmgratis": "https://www.filmaltadefinizione.me", "filmgratis": "https://www.filmaltadefinizione.me",
"filmigratis": "https://filmigratis.org", "filmigratis": "https://filmigratis.org",
channels/eurostreaming.py
+4 -4
View File
@@ -7,10 +7,10 @@
from core import httptools, support from core import httptools, support
from core.item import Item from core.item import Item
def findhost(url): # def findhost(url):
permUrl = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers # permUrl = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers
host = 'https://'+permUrl['location'].replace('https://www.google.it/search?q=site:', '') # host = 'https://'+permUrl['location'].replace('https://www.google.it/search?q=site:', '')
return host # return host
host = support.config.get_channel_url() host = support.config.get_channel_url()
headers = [['Referer', host]] headers = [['Referer', host]]
core/support.py
+9 -1
View File
@@ -1160,7 +1160,6 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
videoitem.server = s[2] if s else 'directo' videoitem.server = s[2] if s else 'directo'
videoitem.title = s[0] if s else config.get_localized_string(30137) videoitem.title = s[0] if s else config.get_localized_string(30137)
srv_param = servertools.get_server_parameters(videoitem.server.lower()) srv_param = servertools.get_server_parameters(videoitem.server.lower())
if srv_param.get('active', False):
if not srv_param: # do not exists or it's empty if not srv_param: # do not exists or it's empty
findS = servertools.get_server_from_url(videoitem.url) findS = servertools.get_server_from_url(videoitem.url)
info(findS) info(findS)
@@ -1176,7 +1175,9 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
videoitem.server = findS[2] videoitem.server = findS[2]
videoitem.title = findS[0] videoitem.title = findS[0]
videoitem.url = findS[1] videoitem.url = findS[1]
srv_param = servertools.get_server_parameters(videoitem.server.lower())
if srv_param.get('active', False):
item.title = typo(item.contentTitle.strip(), 'bold') if item.contentType == 'movie' or (config.get_localized_string(30161) in item.title) else item.title item.title = typo(item.contentTitle.strip(), 'bold') if item.contentType == 'movie' or (config.get_localized_string(30161) in item.title) else item.title
quality = videoitem.quality if videoitem.quality else item.quality if item.quality else '' quality = videoitem.quality if videoitem.quality else item.quality if item.quality else ''
@@ -1195,6 +1196,13 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
# videoitem.strm_path = item.strm_path # videoitem.strm_path = item.strm_path
return videoitem return videoitem
# non threaded for webpdb
# dbg()
# thL = [getItem(videoitem) for videoitem in itemlist if videoitem.url]
# for it in thL:
# if it and not config.get_setting("black_list", server=it.server.lower()):
# verifiedItemlist.append(it)
#
with futures.ThreadPoolExecutor() as executor: with futures.ThreadPoolExecutor() as executor:
thL = [executor.submit(getItem, videoitem) for videoitem in itemlist if videoitem.url] thL = [executor.submit(getItem, videoitem) for videoitem in itemlist if videoitem.url]
for it in futures.as_completed(thL): for it in futures.as_completed(thL):