diff --git a/plugin.video.alfa/channels/eroticage.py b/plugin.video.alfa/channels/eroticage.py index 3c18a5d4..32b9d77c 100644 --- a/plugin.video.alfa/channels/eroticage.py +++ b/plugin.video.alfa/channels/eroticage.py @@ -59,9 +59,8 @@ def lista(item): title = scrapedtitle thumbnail = scrapedthumbnail plot = "" - year = "" itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, thumbnail=thumbnail, - plot=plot, contentTitle=contentTitle, infoLabels={'year':year} )) + plot=plot, fanart=scrapedthumbnail, contentTitle=contentTitle )) next_page = scrapertools.find_single_match(data,'
  • ') if next_page!="": next_page = urlparse.urljoin(item.url,next_page) @@ -80,11 +79,11 @@ def lista(item): def play(item): logger.info() itemlist = [] - data = scrapertools.cachePage(item.url) + data = httptools.downloadpage(item.url).data patron = 'video_url: \'([^\']+)\'' matches = scrapertools.find_multiple_matches(data, patron) for scrapedurl in matches: - itemlist.append(Item(channel=item.channel, action="play", title=item.title, fulltitle=item.fulltitle, url=scrapedurl, + itemlist.append(Item(channel=item.channel, action="play", title=item.title, url=scrapedurl, thumbnail=item.thumbnail, plot=item.plot, show=item.title, server="directo", folder=False)) return itemlist diff --git a/plugin.video.alfa/channels/filmoviXXX.py b/plugin.video.alfa/channels/filmoviXXX.py index 7308fb67..650f9335 100644 --- a/plugin.video.alfa/channels/filmoviXXX.py +++ b/plugin.video.alfa/channels/filmoviXXX.py @@ -26,7 +26,7 @@ def mainlist(item): thumbnail = scrapedthumbnail plot = "" itemlist.append( Item(channel=item.channel, action="play", title=title, url=scrapedurl, - thumbnail=thumbnail, plot=plot, contentTitle=contentTitle)) + thumbnail=thumbnail, fanart=thumbnail, plot=plot, contentTitle=contentTitle)) next_page_url = scrapertools.find_single_match(data,' ([^"]+)' + matches = re.compile(patron,re.DOTALL).findall(data) + for scrapedurl, scrapedtitle in matches: + scrapedplot = "" + scrapedthumbnail = "" + url = urlparse.urljoin(item.url,scrapedurl) + title = scrapedtitle + itemlist.append(item.clone(channel=item.channel, action="lista", title=title , url=url, first=0, + thumbnail=scrapedthumbnail, plot=scrapedplot) ) + return itemlist + + +def lista(item): + logger.info() + itemlist = [] + + next = False + data = httptools.downloadpage(item.url).data + patron = '
    .*?' + patron += ' len(matches): + last = len(matches) + next = True + scrapertools.printMatches(matches) + for scrapedthumbnail, scrapedurl, scrapedtitle in matches[first:last]: + scrapedyear = "-" + title = scrapedtitle.replace(" (2018)", "") + url = urlparse.urljoin(item.url,scrapedurl) + itemlist.append(item.clone(channel=item.channel, action = 'findvideos', title=title, contentTitle = scrapedtitle, + url=url, thumbnail=scrapedthumbnail, infoLabels={'year':scrapedyear} )) + tmdb.set_infoLabels(itemlist, True) + # Paginación + if not next: + url_next_page = item.url + first = last + else: + url_next_page = scrapertools.find_single_match(data, '", "", data) + patron = '<(?:iframe|IFRAME).*?(?:src|SRC)="([^"]+)"' + matches = scrapertools.find_multiple_matches(data, patron) + for url in matches: + lang = "VOSE" + if not config.get_setting('unify'): + title = ' (%s)' % (lang) + else: + title = '' + if url != '': + itemlist.append(item.clone(action="play", title='%s'+title, url=url, language=lang )) + itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) + + # Requerido para Filtrar enlaces + if __comprueba_enlaces__: + itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + # Requerido para FilterTools + itemlist = filtertools.get_links(itemlist, item, list_language) + # Requerido para AutoPlay + autoplay.start(itemlist, item) + + + if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra !='findvideos' and not "/episodios/" in item.url : + itemlist.append(Item(channel=item.channel, action="add_pelicula_to_library", + title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]', url=item.url, + extra="findvideos", contentTitle=item.contentTitle)) + return itemlist + +