From 609f3f6ebceb1571d6c6765cf3dd1579de1f066a Mon Sep 17 00:00:00 2001 From: alfa-addon Date: Fri, 27 Oct 2017 21:55:59 -0400 Subject: [PATCH] Fixed --- plugin.video.alfa/channels/animemovil.py | 8 ++++---- plugin.video.alfa/servers/flashx.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugin.video.alfa/channels/animemovil.py b/plugin.video.alfa/channels/animemovil.py index ac9e621f..a33e40a8 100644 --- a/plugin.video.alfa/channels/animemovil.py +++ b/plugin.video.alfa/channels/animemovil.py @@ -138,7 +138,7 @@ def listado(item): itemlist.append(item.clone(action=action, title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3, contentTitle=title, contentSerieName=show, infoLabels=infoLabels, - context=renumbertools.context, contentType=tipo)) + context=renumbertools.context(item), contentType=tipo)) try: @@ -205,7 +205,7 @@ def completo(item): infoLabels = {'filtro': {"original_language": "ja"}.items()} itemlist.append(Item(channel=item.channel, action=action, title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3, contentTitle=title, contentSerieName=show, extra="completo", - context=renumbertools.context, contentType=tipo, infoLabels=infoLabels)) + context=renumbertools.context(item), contentType=tipo, infoLabels=infoLabels)) return itemlist @@ -227,7 +227,7 @@ def episodios(item): for url, title in matches: url = host + url epi = scrapertools.find_single_match(title, '(?i)%s.*? (\d+) (?:Sub|Audio|Español)' % item.contentSerieName) - new_item = item.clone(action="findvideos", url=url, title=title, extra="", context=renumbertools.context) + new_item = item.clone(action="findvideos", url=url, title=title, extra="") if epi: season, episode = renumbertools.numbered_for_tratk( item.channel, show, 1, int(epi)) @@ -301,7 +301,7 @@ def emision(item): infoLabels = {'filtro': {"original_language": "ja"}.items()} itemlist.append(item.clone(action="episodios", title=scrapedtitle, url=url, thumbnail=thumb, text_color=color3, contentTitle=title, contentSerieName=title, extra="recientes", - context=renumbertools.context, infoLabels=infoLabels)) + context=renumbertools.context(item), infoLabels=infoLabels)) return itemlist diff --git a/plugin.video.alfa/servers/flashx.py b/plugin.video.alfa/servers/flashx.py index e962aa9a..7326085a 100644 --- a/plugin.video.alfa/servers/flashx.py +++ b/plugin.video.alfa/servers/flashx.py @@ -33,11 +33,11 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= 'Cookie': ''} data = httptools.downloadpage(page_url, headers=headers, replace_headers=True).data data = data.replace("\n","") - cgi_counter = scrapertools.find_single_match(data, '(?s)SRC="(https://www.flashx.tv/counter.cgi\?fx=[^"]+)') + cgi_counter = scrapertools.find_single_match(data, '(?is)src=.(https://www.flashx.tv/counter.cgi.*?fx=[0-9a-zA-Z=]+)') cgi_counter = cgi_counter.replace("%0A","").replace("%22","") playnow = scrapertools.find_single_match(data, 'https://www.flashx.tv/dl[^"]+') # Para obtener el f y el fxfx - js_fxfx = scrapertools.find_single_match(data, 'src="(https://www.flashx.tv/js/code.js.*?cache=[0-9]+)') + js_fxfx = scrapertools.find_single_match(data, '(?is)src=.(https://www.flashx.tv/js/code.js.*?=[0-9]+)') data_fxfx = httptools.downloadpage(js_fxfx).data mfxfx = scrapertools.find_single_match(data_fxfx, 'get.*?({.*?})').replace("'","").replace(" ","") matches = scrapertools.find_multiple_matches(mfxfx, '(\w+):(\w+)')