diff --git a/plugin.video.alfa/channels/ciberpeliculashd.py b/plugin.video.alfa/channels/ciberpeliculashd.py index cc9c5a86..01184f6a 100644 --- a/plugin.video.alfa/channels/ciberpeliculashd.py +++ b/plugin.video.alfa/channels/ciberpeliculashd.py @@ -29,36 +29,17 @@ def mainlist(item): extra = "qualitys", thumbnail=get_thumb('quality', auto=True))) itemlist.append(Item(channel = item.channel, title = " Por idioma", action = "filtro", url = host, extra = "languages", thumbnail=get_thumb('language', auto=True))) + itemlist.append(Item(channel = item.channel, title = " Por año", action = "filtro", url = host, + extra = "years", thumbnail=get_thumb('year', auto=True))) itemlist.append(Item(channel = item.channel, title = "")) itemlist.append(Item(channel = item.channel, title = "Series", text_bold = True, folder = False)) itemlist.append(Item(channel = item.channel, title = " Novedades", action = "series", url = host +"/series/?peli=1", thumbnail=get_thumb('newest', auto=True))) - itemlist.append(Item(channel = item.channel, title = " Nuevos Capitulos", action = "nuevos_capitulos", - url = host + "/series/?peli=1", thumbnail=get_thumb('new episodes', auto=True))) itemlist.append(Item(channel = item.channel, title = "")) itemlist.append(Item(channel = item.channel, title = "Buscar", action = "search", url = host + "/?s=", thumbnail=get_thumb('search', auto=True))) return itemlist -def nuevos_capitulos(item): - logger.info() - itemlist = [] - data = httptools.downloadpage(item.url).data - patron = 'class="episode" href="([^"]+).*?' - patron += 'src="([^"]+).*?' - patron += 'title="([^"]+).*?' - patron += '-->([^<]+).*?' - patron += 'created_at">([^<]+)' - matches = scrapertools.find_multiple_matches(data, patron) - for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedepisode, scrapeddays in matches: - scrapedtitle = scrapedtitle + " %s (%s)" %(scrapedepisode.strip(), scrapeddays.strip()) - itemlist.append(Item(action = "findvideos", - channel = item.channel, - title = scrapedtitle, - thumbnail = scrapedthumbnail, - url = scrapedurl - )) - return itemlist def series(item): logger.info() @@ -70,7 +51,7 @@ def series(item): patron += 'title="([^"]+)' matches = scrapertools.find_multiple_matches(bloque, patron) for scrapedurl, scrapedthumbnail, scrapedtitle in matches: - itemlist.append(Item(action = "temporadas", + itemlist.append(Item(action = "capitulos", channel = item.channel, thumbnail = scrapedthumbnail, title = scrapedtitle, @@ -84,25 +65,41 @@ def series(item): next_page += "%s" %page itemlist.append(Item(action = "series", channel = item.channel, - title = "Página siguiente", + title = "Página siguiente >>", url = next_page )) return itemlist -def temporadas(item): +def episodios(item): + logger.info() + itemlist = [] + itemlist = capitulos(item) + return itemlist + + +def capitulos(item): logger.info() itemlist = [] data = httptools.downloadpage(item.url).data - bloque = scrapertools.find_single_match(data, 'Lista de Temporadas.*?') - matches = scrapertools.find_multiple_matches(bloque, ' (.*?[0-9]+)') - for scrapedtitle in matches: - season = scrapertools.find_single_match(scrapedtitle, '[0-9]+') + bloque = scrapertools.find_single_match(data, 'Lista de Temporadas.*?Content principal') + patron = '(.*?)' + matches = scrapertools.find_multiple_matches(bloque, patron) + for scrapedurl, scrapedtitle in matches: + scrapedtitle = scrapedtitle.strip() + s_e = scrapertools.get_season_and_episode(scrapedurl.replace("-","")) + if s_e != "": + season = s_e.split("x")[0] + episode = s_e.split("x")[1] + else: + season = episode = "" + scrapedtitle = s_e + " - " + scrapedtitle + item.infoLabels["episode"] = episode item.infoLabels["season"] = season - url = item.url + "?temporada=%s" %season - itemlist.append(item.clone(action = "capitulos", + itemlist.append(item.clone(action = "findvideos", title = scrapedtitle, - url = url + url = scrapedurl )) tmdb.set_infoLabels(itemlist) if config.get_videolibrary_support(): @@ -116,36 +113,6 @@ def temporadas(item): return itemlist -def episodios(item): - logger.info() - itemlist = [] - templist = temporadas(item) - for tempitem in templist: - itemlist += capitulos(tempitem) - return itemlist - - -def capitulos(item): - logger.info() - itemlist = [] - data = httptools.downloadpage(item.url).data - patron = '