diff --git a/plugin.video.alfa/channels/animeflv.py b/plugin.video.alfa/channels/animeflv.py index 14787bcc..de6d7901 100644 --- a/plugin.video.alfa/channels/animeflv.py +++ b/plugin.video.alfa/channels/animeflv.py @@ -181,7 +181,7 @@ def episodios(item): itemlist.append(item.clone(title=title, url=url, action='findvideos', show=info[1])) itemlist = itemlist[::-1] if config.get_videolibrary_support() and len(itemlist) > 0: - itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", + itemlist.append(Item(channel=item.channel, title="Añadir esta serie a la videoteca", url=item.url, action="add_serie_to_library", extra="episodios")) return itemlist diff --git a/plugin.video.alfa/channels/bloghorror.py b/plugin.video.alfa/channels/bloghorror.py index 0004b752..210c62bb 100644 --- a/plugin.video.alfa/channels/bloghorror.py +++ b/plugin.video.alfa/channels/bloghorror.py @@ -30,8 +30,8 @@ def mainlist(item): itemlist = [] - itemlist.append(Item(channel=item.channel, fanart=fanart, title="Todas", action="list_all", url=host, - thumbnail=get_thumb('all', auto=True))) + itemlist.append(Item(channel=item.channel, fanart=fanart, title="Todas", action="list_all", + url=host+'/category/terror', thumbnail=get_thumb('all', auto=True))) itemlist.append(Item(channel=item.channel, fanart=fanart, title="Asiaticas", action="list_all", url=host+'/category/asiatico', thumbnail=get_thumb('asiaticas', auto=True))) diff --git a/plugin.video.alfa/channels/canalpelis.py b/plugin.video.alfa/channels/canalpelis.py index cbea6079..3a4a8b5a 100644 --- a/plugin.video.alfa/channels/canalpelis.py +++ b/plugin.video.alfa/channels/canalpelis.py @@ -348,31 +348,38 @@ def episodios(item): return itemlist - def findvideos(item): logger.info() + from lib import generictools + import urllib + import base64 itemlist = [] - data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\(.*?\)|\s{2}| ", "", data) - patron = '
' + patron = 'data-post="(\d+)" data-nume="(\d+)".*?img src=\'([^\']+)\'' matches = re.compile(patron, re.DOTALL).findall(data) + for id, option, lang in matches: + lang = scrapertools.find_single_match(lang, '.*?/flags/(.*?).png') + if lang == 'en': + lang = 'VOSE' + post = {'action': 'doo_player_ajax', 'post': id, 'nume': option, 'type':'movie'} + post = urllib.urlencode(post) + test_url = '%swp-admin/admin-ajax.php' % host + new_data = httptools.downloadpage(test_url, post=post, headers={'Referer':item.url}).data + hidden_url = scrapertools.find_single_match(new_data, "src='([^']+)'") + new_data = httptools.downloadpage(hidden_url, follow_redirects=False) + try: + b64_url = scrapertools.find_single_match(new_data.headers['location'], "y=(.*)") + url = base64.b64decode(b64_url) + except: + url = hidden_url + if url != '': + itemlist.append( + Item(channel=item.channel, url=url, title='%s', action='play', language=lang, + infoLabels=item.infoLabels)) - for option, url in matches: - datas = httptools.downloadpage(urlparse.urljoin(host, url), - headers={'Referer': item.url}).data - - patron = ']+src="([^"]+)"' - url = scrapertools.find_single_match(datas, patron) - lang = scrapertools.find_single_match( - data, '
  • <\/b> (.*?)' % option) - lang = lang.replace('Español ', '').replace('B.S.O. ', '') - - server = servertools.get_server_from_url(url) - title = "%s [COLOR yellow](%s) (%s)[/COLOR]" % (item.contentTitle, server.title(), lang) - itemlist.append(item.clone(action='play', url=url, title=title, extra1=title, - server=server, language = lang, text_color=color3)) + itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize()) if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'episodios': itemlist.append(Item(channel=__channel__, url=item.url, action="add_pelicula_to_library", extra="findvideos", diff --git a/plugin.video.alfa/channels/dilo.py b/plugin.video.alfa/channels/dilo.py index 70a52b20..a1c8dfde 100644 --- a/plugin.video.alfa/channels/dilo.py +++ b/plugin.video.alfa/channels/dilo.py @@ -204,14 +204,13 @@ def episodesxseason(item): data = jsontools.load(httptools.downloadpage(seasons_url, post=post, headers=headers).data) infoLabels = item.infoLabels for dict in data: - episode = dict['number'] epi_name = dict['name'] title = '%sx%s - %s' % (season, episode, epi_name) url = '%s%s/' % (host, dict['permalink']) infoLabels['episode'] = episode itemlist.append(Item(channel=item.channel, title=title, action='findvideos', url=url, - contentEpisodeNumber=season, id=item.id, infoLabels=infoLabels)) + contentEpisodeNumber=episode, id=item.id, infoLabels=infoLabels)) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) diff --git a/plugin.video.alfa/channels/fanpelis.py b/plugin.video.alfa/channels/fanpelis.py index aba09ec5..ede3f2d6 100644 --- a/plugin.video.alfa/channels/fanpelis.py +++ b/plugin.video.alfa/channels/fanpelis.py @@ -247,10 +247,17 @@ def episodesxseason(item): def findvideos(item): logger.info() + import urllib + itemlist = [] data = get_source(item.url) - patron = '