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

ops

Browse Source
This commit is contained in:
marco
2020-05-19 19:49:46 +02:00
parent 538a17254f
commit 2fa15538f4
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/servertools.py
+3 -3
View File
@@ -219,17 +219,17 @@ def get_server_from_url(url):
continue continue
serverid = get_server_name(serverid) serverid = get_server_name(serverid)
if not serverid: if not serverid:
return [] continue
server_parameters = get_server_parameters(serverid) server_parameters = get_server_parameters(serverid)
if not server_parameters["active"]: if not server_parameters["active"]:
return [] continue
if "find_videos" in server_parameters: if "find_videos" in server_parameters:
# Recorre los patrones # Recorre los patrones
for pattern in server_parameters["find_videos"].get("patterns", []): for pattern in server_parameters["find_videos"].get("patterns", []):
msg = "%s\npattern: %s" % (serverid, pattern["pattern"]) msg = "%s\npattern: %s" % (serverid, pattern["pattern"])
# Recorre los resultados # Recorre los resultados
match = re.match(pattern["pattern"], url) match = re.search(pattern["pattern"], url)
if match: if match:
url = pattern["url"] url = pattern["url"]
# Crea la url con los datos # Crea la url con los datos
core/support.py
+9 -11
View File
@@ -1119,18 +1119,16 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
def getItem(videoitem): def getItem(videoitem):
if not videoitem.server: if not videoitem.server:
findS = servertools.get_server_from_url(videoitem.url) findS = servertools.get_server_from_url(videoitem.url)
if findS: log(findS)
findS = findS[0] if not findS:
elif item.channel == 'community': if item.channel == 'community':
findS= ('Diretto', videoitem.url, 'directo') findS= ('Diretto', videoitem.url, 'directo')
else:
videoitem.url = unshortenit.unshorten_only(videoitem.url)[0]
findS = servertools.get_server_from_url(videoitem.url)
if findS:
findS = findS[0]
else: else:
log(videoitem, 'Non supportato') videoitem.url = unshortenit.unshorten_only(videoitem.url)[0]
return findS = servertools.get_server_from_url(videoitem.url)
if not findS:
log(videoitem, 'Non supportato')
return
videoitem.server = findS[2] videoitem.server = findS[2]
videoitem.title = findS[0] videoitem.title = findS[0]
videoitem.url = findS[1] videoitem.url = findS[1]