(.*?)
.*?' - patron += "(.*?)
(\d{4}) /.*?.*?'(\d+)'" - matches = re.compile(patron, re.DOTALL).findall(data) + patron = '([^>]+)
.*?' + matches = re.compile(patron, re.DOTALL).findall(data) - for scrapedthumbnail, scrapedurl, scrapedtitle, scrapedplot, year, video_id in matches: + for scrapedurl, scrapedthumbnail, scrapedtitle in matches: - title = '%s [%s]' % (scrapedtitle, year) - contentTitle = scrapedtitle - thumbnail = scrapedthumbnail - url = scrapedurl + title = scrapedtitle + thumbnail = scrapedthumbnail.strip() + url = scrapedurl + filter_thumb = thumbnail.replace("https://image.tmdb.org/t/p/w154", "") + filter_list = {"poster_path": filter_thumb} + filter_list = filter_list.items() + new_item = Item(channel=item.channel, + title=title, + url=url, + thumbnail=thumbnail, + plot=thumbnail, + infoLabels={'filtro':filter_list}) - itemlist.append(item.clone(action='findvideos', - title=title, - url=url, - thumbnail=thumbnail, - contentTitle=contentTitle, - video_id=video_id, - infoLabels={'year':year})) + if item.type == 'peliculas': + new_item.action = 'findvideos' + new_item.contentTitle = scrapedtitle + else: + new_item.action = 'seasons' + new_item.contentSerieName = scrapedtitle - elif item.type == 'series': - patron = '(.*?)
(.*?)
(\d{4}) /' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot, year in matches: - title = scrapedtitle - contentSerieName = scrapedtitle - thumbnail = scrapedthumbnail - url = scrapedurl - - itemlist.append(item.clone(action='seasons', - title=title, - url=url, - thumbnail=thumbnail, - plot=scrapedplot, - contentSerieName=contentSerieName, - infoLabels={'year':year})) + itemlist.append(new_item) tmdb.set_infoLabels(itemlist, seekTmdb=True) # Paginación @@ -199,21 +189,18 @@ def episodesxseasons(item): itemlist = [] data=get_source(item.url) - logger.debug(data) - patron= "ViewEpisode\('(\d+)', this\)>([^>]+)
" % item.infoLabels['season'] matches = re.compile(patron, re.DOTALL).findall(data) infoLabels = item.infoLabels - for video_id, scrapedepisode, scrapedthumbnail, scrapedtitle in matches: + for url, scrapedepisode, scrapedtitle in matches: infoLabels['episode'] = scrapedepisode title = '%sx%s - %s' % (infoLabels['season'], infoLabels['episode'], scrapedtitle) - itemlist.append(Item(channel=item.channel, title= title, url=item.url, thumbnail=scrapedthumbnail, - action='findvideos', video_id=video_id, infoLabels=infoLabels)) + itemlist.append(Item(channel=item.channel, title= title, url=url, action='findvideos', + infoLabels=infoLabels)) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) @@ -224,87 +211,45 @@ def findvideos(item): logger.info() from lib import jsunpack itemlist = [] - headers = {'referer':item.url} - if item.video_id == '': - find_id = get_source(item.url) - #logger.debug(find_id) - #return - item.video_id = scrapertools.find_single_match(find_id, 'var centerClick = (\d+);') - url = 'https://goovie.co/api/links/%s' % item.video_id - data = httptools.downloadpage(url, headers=headers).data - video_list = jsontools.load(data) - for video_info in video_list: - logger.debug(video_info) - url = video_info['visor'] - plot = 'idioma: %s calidad: %s' % (video_info['idioma'], video_info['calidad']) + data = get_source(item.url) + + patron = "onclick=clickLink\(this, '([^']+)', '([^']+)', '([^']+)'\);>" + matches = re.compile(patron, re.DOTALL).findall(data) + headers = {'referer': item.url} + for url, quality, language in matches: + data = httptools.downloadpage(url, headers=headers, follow_redirects=False).data data = re.sub(r'"|\n|\r|\t| ||\s{2,}', "", data) packed = scrapertools.find_single_match(data, '(eval\(.*?);var') unpacked = jsunpack.unpack(packed) - logger.debug('unpacked %s' % unpacked) server = scrapertools.find_single_match(unpacked, "src:.'(http://\D+)/") id = scrapertools.find_single_match(unpacked, "src:.'http://\D+/.*?description:.'(.*?).'") if server == '': if 'powvideo' in unpacked: - id = scrapertools.find_single_match(unpacked ,",description:.'(.*?).'") - server= 'https://powvideo.net' + id = scrapertools.find_single_match(unpacked, ",description:.'(.*?).'") + server = 'https://powvideo.net' url = '%s/%s' % (server, id) if server != '' and id != '': - language = IDIOMAS[video_info['idioma']] - quality = CALIDADES[video_info['calidad']] + language = IDIOMAS[language] + quality = CALIDADES[quality] title = ' [%s] [%s]' % (language, quality) - itemlist.append(Item(channel=item.channel, title='%s'+title, url=url, action='play', language=language, - quality=quality)) - - itmelist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) + itemlist.append(Item(channel=item.channel, title='%s' + title, url=url, action='play', language=language, + quality=quality, infoLabels=item.infoLabels)) + itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) return sorted(itemlist, key=lambda i: i.language) + def search(item, texto): logger.info() texto = texto.replace(" ", "+") item.url = item.url + texto item.type = 'peliculas' if texto != '': - return search_results(item) + return list_all(item) else: return [] -def search_results(item): - logger.info() - - itemlist=[] - - data=get_source(item.url) - logger.debug(data) - patron = '
(.*?)
(.*?)
(\d{4})<' - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, content_type ,scrapedthumb, scrapedtitle, scrapedplot, year in matches: - - title = scrapedtitle - url = scrapedurl - thumbnail = scrapedthumb - plot = scrapedplot - if content_type != 'Serie': - action = 'findvideos' - else: - action = 'seasons' - - new_item=Item(channel=item.channel, title=title, url=url, thumbnail=thumbnail, plot=plot, - action=action, type=content_type, infoLabels={'year':year}) - if new_item.action == 'findvideos': - new_item.contentTitle = new_item.title - else: - new_item.contentSerieName = new_item.title - - itemlist.append(new_item) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - - return itemlist - def newest(categoria): logger.info() itemlist = [] @@ -313,9 +258,9 @@ def newest(categoria): if categoria in ['peliculas']: item.url = host + 'peliculas' elif categoria == 'infantiles': - item.url = host + 'peliculas/generos/animación' + item.url = host + 'peliculas/filtro/Animación,/,' elif categoria == 'terror': - item.url = host + 'peliculas/generos/terror' + item.url = host + 'peliculas/filtro/Terror,/,' item.type='peliculas' itemlist = list_all(item) if itemlist[-1].title == 'Siguiente >>': diff --git a/plugin.video.alfa/channels/pelisipad.py b/plugin.video.alfa/channels/pelisipad.py index 63034e92..2abea066 100644 --- a/plugin.video.alfa/channels/pelisipad.py +++ b/plugin.video.alfa/channels/pelisipad.py @@ -77,10 +77,10 @@ def submenu(item): url=host % "list/ultimas-peliculas" + ext, text_color=color2, thumbnail=host % "list/ultimas-peliculas/thumbnail_167x250.jpg", fanart=host % "list/ultimas-peliculas/background_1080.jpg", viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Destacados", action="entradas", - url=host % "list/000-novedades" + ext, text_color=color2, - thumbnail=host % "list/screener/thumbnail_167x250.jpg", - fanart=host % "list/screener/background_1080.jpg", viewmode="movie_with_plot")) + # itemlist.append(Item(channel=item.channel, title="Destacados", action="entradas", + # url=host % "list/000-novedades" + ext, text_color=color2, + # thumbnail=host % "list/screener/thumbnail_167x250.jpg", + # fanart=host % "list/screener/background_1080.jpg", viewmode="movie_with_plot")) itemlist.append(Item(channel=item.channel, title="Más vistas", action="entradas", url=host % "list/peliculas-mas-vistas" + ext, text_color=color2, thumbnail=host % "list/peliculas-mas-vistas/thumbnail_167x250.jpg", @@ -167,7 +167,7 @@ def entradas(item): #if child['year']: # title += " (" + child['year'] + ")" #title += quality - + thumbnail += "|User-Agent=%s" % httptools.get_user_agent video_urls = [] for k, v in child.get("video", {}).items(): for vid in v: @@ -232,6 +232,7 @@ def entradasconlistas(item): thumbnail = host % "list/%s/thumbnail_167x250.jpg" % child["id"] fanart = host % "list/%s/background_1080.jpg" % child["id"] + thumbnail += "|User-Agent=%s" % httptools.get_user_agent itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, show=show, infoLabels=infolabels, contentTitle=fulltitle, viewmode="movie_with_plot", @@ -295,7 +296,7 @@ def entradasconlistas(item): for vid in v: video_urls.append(["http://%s.pelisipad.com/s/transcoder/%s" % (vid["server"], vid["url"]) + "?%s", vid["height"]]) - + thumbnail += "|User-Agent=%s" % httptools.get_user_agent itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, video_urls=video_urls, thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, infoLabels=infolabels, contentTitle=fulltitle, viewmode="movie_with_plot", text_color=color3)) @@ -347,6 +348,7 @@ def series(item): if child.get("numberOfSeasons") and "- Temporada" not in title: title += " (Temps:%s)" % child['numberOfSeasons'] + thumbnail += "|User-Agent=%s" % httptools.get_user_agent itemlist.append(Item(channel=item.channel, action="episodios", title=title, url=url, text_color=color3, thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, infoLabels=infolabels, contentTitle=fulltitle, viewmode="movie_with_plot", show=fulltitle)) @@ -414,6 +416,7 @@ def episodios(item): title = fulltitle = child['name'].rsplit(" ", 1)[0] + " - " + child['name'].rsplit(" ", 1)[1] except: title = fulltitle = child['id'].replace("-", " ") + thumbnail += "|User-Agent=%s" % httptools.get_user_agent itemlist.append(Item(channel=item.channel, action="findvideos", title=title, url=url, thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, contentTitle=fulltitle, viewmode="movie", show=item.show, infoLabels=infoLabels, video_urls=video_urls, extra="episodios", @@ -491,6 +494,7 @@ def nuevos_cap(item): else: title = fulltitle = child['name'] + thumbnail += "|User-Agent=%s" % httptools.get_user_agent itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, thumbnail=thumbnail, fanart=fanart, fulltitle=fulltitle, contentTitle=fulltitle, viewmode="movie", show=item.fulltitle, infoLabels=infoLabels, video_urls=video_urls, extra="nuevos", @@ -571,6 +575,7 @@ def listas(item): infolabels['title'] = title try: from core import videolibrarytools + thumbnail += "|User-Agent=%s" % httptools.get_user_agent new_item = item.clone(title=title, url=url, fulltitle=title, fanart=fanart, extra="findvideos", thumbnail=thumbnail, infoLabels=infolabels, category="Cine") videolibrarytools.add_movie(new_item) diff --git a/plugin.video.alfa/channels/seriesblanco.py b/plugin.video.alfa/channels/seriesblanco.py index 45a6f607..0eed39d9 100644 --- a/plugin.video.alfa/channels/seriesblanco.py +++ b/plugin.video.alfa/channels/seriesblanco.py @@ -212,21 +212,21 @@ def new_episodes(item): itemlist = [] data = get_source(item.url) - data = scrapertools.find_single_match(data, '