diff --git a/plugin.video.alfa/channels/pepecine.py b/plugin.video.alfa/channels/pepecine.py index fd3d6986..8619c527 100644 --- a/plugin.video.alfa/channels/pepecine.py +++ b/plugin.video.alfa/channels/pepecine.py @@ -15,7 +15,7 @@ from core.item import Item, InfoLabels from platformcode import config, logger from channels import filtertools -host = "https://pepecine.io" +host = "https://pepecine.me" # "https://pepecine.io" IDIOMAS = {'c': 'Castellano', 'i': 'Inglés', 'l': 'Latino', 's': 'VOSE', 'v': 'VO'} list_idiomas = IDIOMAS.values() @@ -30,34 +30,34 @@ def mainlist(item): itemlist.append(item.clone( title = " Últimas películas", - url = host + '/las-peliculas-online', + url = host + '/mis-peliculas-online', action = 'list_latest', type = 'movie')) itemlist.append(item.clone(title = " Películas por género", - url = host + '/ver-pelicula', + url = host + '/ver-la-pelicula', action = 'genero', type = 'movie')) itemlist.append(item.clone(title = " Todas las películas", - url = host + '/ver-pelicula', + url = host + '/ver-la-pelicula', action = 'list_all', type = 'movie')) itemlist.append(Item(title = "Series")) itemlist.append(item.clone(title = " Últimos episodios", - url = host + '/las-series-online', + url = host + '/mis-series-online', action = 'list_latest', type = 'series')) itemlist.append(item.clone(title = " Series por género", - url = host + '/ver-serie-tv', + url = host + '/ver-la-serie', action = 'genero', type = 'series')) itemlist.append(item.clone(title = " Todas las series", - url = host + '/ver-serie-tv', + url = host + '/ver-la-serie', action ='list_all', type = 'series')) @@ -251,11 +251,11 @@ def list_all(item): new_item.contentTitle = element['title'] new_item.fulltitle = element['title'] if new_item.extra != "links_encoded": - new_item.url = host + "/ver-pelicula/" + str(element['id']) + new_item.url = host + "/ver-la-pelicula/" + str(element['id']) elif item.type == 'series': new_item.action = 'seasons' - new_item.url = host + "/ver-serie-tv/" + str(element['id']) + new_item.url = host + "/ver-la-serie/" + str(element['id']) new_item.show = element['title'] new_item.contentType = 'tvshow' new_item.contentSerieName = element['title'] @@ -334,8 +334,8 @@ def findvideos(item): if item.extra != "links_encoded": data = httptools.downloadpage(item.url).data - patron = "renderTab\.bind.*?'([^']+)" - patron += '.*?([^<]*)' + patron = "renderTab\.bind[^']+'([^']+)" + patron += '.*?]*>([^<]*)]*>([^<]*)' patron += '.*?]*>([^<]*)' diff --git a/plugin.video.alfa/lib/alfaresolver.py b/plugin.video.alfa/lib/alfaresolver.py new file mode 100644 index 00000000..05fe0ea8 --- /dev/null +++ b/plugin.video.alfa/lib/alfaresolver.py @@ -0,0 +1 @@ +import base64; exec(base64.b64decode('import marshal
exec(marshal.loads(base64.b64decode('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')))')) \ No newline at end of file diff --git a/plugin.video.alfa/platformcode/logger.py b/plugin.video.alfa/platformcode/logger.py index 10741580..6c6c2e4f 100644 --- a/plugin.video.alfa/platformcode/logger.py +++ b/plugin.video.alfa/platformcode/logger.py @@ -35,7 +35,10 @@ def encode_log(message=""): def get_caller(message=None): module = inspect.getmodule(inspect.currentframe().f_back.f_back) - module = module.__name__ + if module == None: + module = "None" + else: + module = module.__name__ function = inspect.currentframe().f_back.f_back.f_code.co_name diff --git a/plugin.video.alfa/resources/settings.xml b/plugin.video.alfa/resources/settings.xml index b9b426cc..a8b93528 100644 --- a/plugin.video.alfa/resources/settings.xml +++ b/plugin.video.alfa/resources/settings.xml @@ -4,7 +4,7 @@ - + diff --git a/plugin.video.alfa/servers/powvideo.py b/plugin.video.alfa/servers/powvideo.py index 086f8896..4c1bded5 100644 --- a/plugin.video.alfa/servers/powvideo.py +++ b/plugin.video.alfa/servers/powvideo.py @@ -33,12 +33,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= url = scrapertools.find_single_match(unpacked, "(?:src):\\\\'([^\\\\]+.mp4)\\\\'") - itemlist.append([".mp4" + " [powvideo]", decode_video_url(url)]) + from lib import alfaresolver + itemlist.append([".mp4" + " [powvideo]", alfaresolver.decode_video_url(url, data)]) + itemlist.sort(key=lambda x: x[0], reverse=True) return itemlist - -def decode_video_url(url): - tria = re.compile('[0-9a-z]{40,}', re.IGNORECASE).findall(url)[0] - gira = tria[::-1] - x = gira[1:] - return re.sub(tria, x, url) diff --git a/plugin.video.alfa/servers/streamplay.py b/plugin.video.alfa/servers/streamplay.py index 7171b569..c46286f4 100644 --- a/plugin.video.alfa/servers/streamplay.py +++ b/plugin.video.alfa/servers/streamplay.py @@ -38,13 +38,10 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= unpacked = jsunpack.unpack(packed) url = scrapertools.find_single_match(unpacked, '(http[^,]+\.mp4)') - itemlist.append([".mp4" + " [streamplay]", decode_video_url(url)]) + + from lib import alfaresolver + itemlist.append([".mp4" + " [streamplay]", alfaresolver.decode_video_url(url, data)]) + itemlist.sort(key=lambda x: x[0], reverse=True) return itemlist - -def decode_video_url(url): - tria = re.compile('[0-9a-z]{40,}', re.IGNORECASE).findall(url)[0] - gira = tria[::-1] - x = gira[:4] + gira[6:] - return re.sub(tria, x, url)