diff --git a/plugin.video.alfa/channels/thumbzilla.py b/plugin.video.alfa/channels/thumbzilla.py index b17b9a65..d0273b3c 100644 --- a/plugin.video.alfa/channels/thumbzilla.py +++ b/plugin.video.alfa/channels/thumbzilla.py @@ -69,7 +69,11 @@ def mainlist(item): itemlist.append(Item(channel=__channel__, title="Caseros", url=host + '/hd', action="videos", viewmode="movie_with_plot", viewcontent='homemade', thumbnail=get_thumb("channels_adult.png"))) - + + itemlist.append(Item(channel=__channel__, title="PornStar", action="catalogo", + url=host + '/pornstars/', viewmode="movie_with_plot", viewcontent='movies', + thumbnail=get_thumb("channels_adult.png"))) + itemlist.append(Item(channel=__channel__, title="Categorías", action="categorias", url=host + '/categories/', viewmode="movie_with_plot", viewcontent='movies', thumbnail=get_thumb("channels_adult.png"))) @@ -100,28 +104,45 @@ def search(item, texto): def videos(item): logger.info() itemlist = [] - data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) patron = '' # url patron += '([^<]+)') title = "[%s] %s" % (time, scrapedtitle) - + if ">HD<" in scrapedtime: + title = "[COLOR yellow]" + time + "[/COLOR] " + "[COLOR red]" + "HD" + "[/COLOR] " + scrapedtitle itemlist.append(Item(channel=item.channel, action='play', title=title, thumbnail=scrapedthumbnail, url=host + scrapedurl, contentTile=scrapedtitle, fanart=scrapedthumbnail)) - paginacion = scrapertools.find_single_match(data, '').replace('amp;', '') - if paginacion: itemlist.append(Item(channel=item.channel, action="videos", thumbnail=thumbnail % 'rarrow', title="\xc2\xbb Siguiente \xc2\xbb", url=paginacion)) + return itemlist + +def catalogo(item): + logger.info() + itemlist = [] + data = httptools.downloadpage(item.url).data + data = re.sub(r"\n|\r|\t| |
", "", data) + patron = '
  • .*? + #
    + # + #
    + #
    + #
    HD
    36:28
    + #
    + #
    + #
    + #
    Jacquieetmicheltv - Deux blacks TBM pour Julia, 30ans !
    + + # + + # / 5.1k views + + + + #
    +# # Extrae las entradas de la pagina seleccionada - patron = "(.*?)" + patron = "(.*?)" matches = re.compile(patron, re.DOTALL).findall(data) itemlist = [] - for scrapedthumbnail, scrapedurl, scrapedtitle in matches: + for scrapedthumbnail, scrapedhd, duration, scrapedurl, scrapedtitle in matches: thumbnail = urlparse.urljoin(item.url, scrapedthumbnail) url = urlparse.urljoin(item.url, scrapedurl) - title = scrapedtitle.strip() - + scrapedtitle = scrapedtitle.strip() + title = "[COLOR yellow]" + duration + "[/COLOR] " + "[COLOR red]" +scrapedhd+ "[/COLOR] "+scrapedtitle # Añade al listado itemlist.append(Item(channel=item.channel, action="play", title=title, thumbnail=thumbnail, fanart=thumbnail, fulltitle=title, url=url,