From 5b0f67d6ea1341f5f6db52c7294753a48a5262eb Mon Sep 17 00:00:00 2001 From: alfa-addon Date: Tue, 22 Aug 2017 18:22:23 -0400 Subject: [PATCH] minor fixes --- plugin.video.alfa/channels/descargasmix.json | 8 +++ plugin.video.alfa/channels/serieslan.py | 54 ++++++++++---------- plugin.video.alfa/servers/streamplay.py | 4 +- 3 files changed, 38 insertions(+), 28 deletions(-) mode change 100755 => 100644 plugin.video.alfa/channels/descargasmix.json mode change 100755 => 100644 plugin.video.alfa/channels/serieslan.py mode change 100755 => 100644 plugin.video.alfa/servers/streamplay.py diff --git a/plugin.video.alfa/channels/descargasmix.json b/plugin.video.alfa/channels/descargasmix.json old mode 100755 new mode 100644 index 646514c2..d519252e --- a/plugin.video.alfa/channels/descargasmix.json +++ b/plugin.video.alfa/channels/descargasmix.json @@ -59,6 +59,14 @@ "Perfil 2", "Perfil 1" ] + }, + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": false, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/serieslan.py b/plugin.video.alfa/channels/serieslan.py old mode 100755 new mode 100644 index 3b2070ab..fac754c4 --- a/plugin.video.alfa/channels/serieslan.py +++ b/plugin.video.alfa/channels/serieslan.py @@ -85,14 +85,14 @@ def episodios(item): total_episode += 1 season, episode = renumbertools.numbered_for_tratk(item.channel, item.show, 1, total_episode) if len(name.split(pat)) == i: - title += "{0}x{1:02d} ".format(season, episode) + title += "%sx%s " % (season, str(episode).zfill(2)) else: - title += "{0}x{1:02d}_".format(season, episode) + title += "%sx%s_" % (season, str(episode).zfill(2)) else: total_episode += 1 season, episode = renumbertools.numbered_for_tratk(item.channel, item.show, 1, total_episode) - title += "{0}x{1:02d} ".format(season, episode) + title += "%sx%s " % (season, str(episode).zfill(2)) url = host + "/" + link if "disponible" in link: @@ -110,21 +110,17 @@ def episodios(item): return itemlist -# def getUrlVideo(item): def findvideos(item): - ## Kodi 17+ - ## Openload as default server + logger.info() import base64 itemlist = [] - ## Urls - urlServer = "https://openload.co/embed/%s/" - urlApiGetKey = "https://serieslan.com/idv.php?i=%s" + url_server = "https://openload.co/embed/%s/" + url_api_get_key = "https://serieslan.com/ide.php?i=%s&k=%s" - ## JS - def txc(key, str): + def txc(key, _str): s = range(256) j = 0 res = '' @@ -135,13 +131,13 @@ def findvideos(item): s[j] = x i = 0 j = 0 - for y in range(len(str)): + for y in range(len(_str)): i = (i + 1) % 256 j = (j + s[i]) % 256 x = s[i] s[i] = s[j] s[j] = x - res += chr(ord(str[y]) ^ s[(s[i] + s[j]) % 256]) + res += chr(ord(_str[y]) ^ s[(s[i] + s[j]) % 256]) return res data = httptools.downloadpage(item.url).data @@ -151,20 +147,26 @@ def findvideos(item): '
.+?') show = scrapertools.find_single_match(data, 'Episodio: <\/span>([^"]*)<\/p>

Idioma') thumbnail = host + thumbnail - data = httptools.downloadpage(urlApiGetKey % idv, headers={'Referer': item.url}).data - video_url = urlServer % (txc(ide, base64.decodestring(data))) - server = "openload" - if " SUB" in item.title: - lang = "VOS" - elif " Sub" in item: - lang = "VOS" - else: - lang = "Latino" - title = "Enlace encontrado en " + server + " [" + lang + "]" - itemlist.append(Item(channel=item.channel, action="play", title=title, show=show, url=video_url, plot=item.plot, - thumbnail=thumbnail, server=server, folder=False)) + data = httptools.downloadpage(url_api_get_key % (idv, ide), headers={'Referer': item.url}).data + data = eval(data) - return itemlist + if type(data) == list: + logger.debug("inside") + video_url = url_server % (txc(ide, base64.decodestring(data[2]))) + server = "openload" + if " SUB" in item.title: + lang = "VOS" + elif " Sub" in item: + lang = "VOS" + else: + lang = "Latino" + title = "Enlace encontrado en " + server + " [" + lang + "]" + itemlist.append(Item(channel=item.channel, action="play", title=title, show=show, url=video_url, plot=item.plot, + thumbnail=thumbnail, server=server, folder=False)) + + return itemlist + else: + return [] def play(item): diff --git a/plugin.video.alfa/servers/streamplay.py b/plugin.video.alfa/servers/streamplay.py old mode 100755 new mode 100644 index fd59b2f1..aa5d3651 --- a/plugin.video.alfa/servers/streamplay.py +++ b/plugin.video.alfa/servers/streamplay.py @@ -17,7 +17,8 @@ def test_video_exists(page_url): data = httptools.downloadpage(page_url, headers={'Referer': referer}).data if data == "File was deleted": return False, "[Streamplay] El archivo no existe o ha sido borrado" - + elif "Video is processing now" in data: + return False, "[Streamplay] El archivo se está procesando" return True, "" @@ -26,7 +27,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= referer = re.sub(r"embed-|player-", "", page_url)[:-5] data = httptools.downloadpage(page_url, headers={'Referer': referer}).data - matches = scrapertools.find_single_match(data, "") data = jsunpack.unpack(matches).replace("\\", "")