diff --git a/plugin.video.alfa/channels/animeflv.py b/plugin.video.alfa/channels/animeflv.py index 7452e3e4..5eced559 100644 --- a/plugin.video.alfa/channels/animeflv.py +++ b/plugin.video.alfa/channels/animeflv.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re import time @@ -11,7 +11,7 @@ from core import jsontools from core import servertools from core import scrapertools from core.item import Item -from platformcode import logger +from platformcode import config, logger HOST = "https://animeflv.net/" @@ -242,7 +242,7 @@ def episodios(item): else: season, episode = renumbertools.numbered_for_tratk(item.channel, item.show, 1, episode) - title = "%s: %sx%s" % (item.title, season, str(episode).zfill(2)) + title = "%sx%s : %s" % (season, str(episode).zfill(2), item.title) itemlist.append(item.clone(action="findvideos", title=title, url=url, thumbnail=thumb, fulltitle=title, fanart=item.thumbnail, contentType="episode")) @@ -263,11 +263,15 @@ def episodios(item): else: season, episode = renumbertools.numbered_for_tratk(item.channel, item.show, 1, episode) - title = "%s: %sx%s" % (item.title, season, str(episode).zfill(2)) + title = "%sx%s : %s" % (season, str(episode).zfill(2), item.title) itemlist.append(item.clone(action="findvideos", title=title, url=url, thumbnail=thumb, fulltitle=title, fanart=item.thumbnail, contentType="episode")) + if config.get_videolibrary_support() and len(itemlist) > 0: + itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url, + action="add_serie_to_library", extra="episodios", show=item.title )) + return itemlist diff --git a/plugin.video.alfa/channels/animeflv_me.py b/plugin.video.alfa/channels/animeflv_me.py index 5adaf6e9..976907d7 100755 --- a/plugin.video.alfa/channels/animeflv_me.py +++ b/plugin.video.alfa/channels/animeflv_me.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- import re import urlparse @@ -315,7 +315,6 @@ def episodios(item): itemlist.append(Item(channel=item.channel, title="Descargar todos los episodios", url=item.url, action="download_all_episodes", extra="episodios", show=item.show)) - return itemlist @@ -324,23 +323,48 @@ def findvideos(item): itemlist = [] - page_html = get_url_contents(item.url) - - regex_api = r'http://player\.animeflv\.me/[^\"]+' - iframe_url = scrapertools.find_single_match(page_html, regex_api) - - iframe_html = get_url_contents(iframe_url) - - regex_video_list = r'var part = \[([^\]]+)' - - videos_html = scrapertools.find_single_match(iframe_html, regex_video_list) - videos = re.findall('"([^"]+)"', videos_html, re.DOTALL) - qualities = ["360", "480", "720", "1080"] - - for quality_id, video_url in enumerate(videos): + if 'player' in item.url: + page_html = get_url_contents(item.url) + data = re.sub(r"\n|\r|\t|\s{2}| ", "", page_html) + patron_open='.+?