diff --git a/plugin.video.alfa/channels/divxtotal.py b/plugin.video.alfa/channels/divxtotal.py old mode 100755 new mode 100644 index 9a7746e3..889bd667 --- a/plugin.video.alfa/channels/divxtotal.py +++ b/plugin.video.alfa/channels/divxtotal.py @@ -232,7 +232,6 @@ def findtemporadas(item): th.start() data = httptools.downloadpage(item.url).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - if len(item.extra.split("|")): if len(item.extra.split("|")) >= 4: fanart = item.extra.split("|")[2] @@ -266,7 +265,7 @@ def findtemporadas(item): fanart_extra = item.fanart fanart_info = item.fanart - bloque_episodios = scrapertools.find_multiple_matches(data, 'Temporada (\d+) (.*?)') + bloque_episodios = scrapertools.find_multiple_matches(data, 'Temporada.*?(\d+).*?<\/a>(.*?)<\/table>') for temporada, bloque_epis in bloque_episodios: item.infoLabels = item.InfoLabels item.infoLabels['season'] = temporada @@ -299,9 +298,8 @@ def epis(item): itemlist = [] if item.extra == "serie_add": item.url = item.datalibrary - patron = scrapertools.find_multiple_matches(item.url, - '
.*?(\d+x\d+).*?td>')
+ '
.*?(\d+x\d+).*?td>')
for idioma, url, epi in patron:
episodio = scrapertools.find_single_match(epi, '\d+x(\d+)')
item.infoLabels['episode'] = episodio
diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py
index 0d613847..d5d573e4 100644
--- a/plugin.video.alfa/channels/newpct1.py
+++ b/plugin.video.alfa/channels/newpct1.py
@@ -8,7 +8,9 @@ from core import scrapertools
from core import servertools
from core.item import Item
from platformcode import config, logger
+from core import tmdb
+host = 'http://newpct1.com/'
def mainlist(item):
logger.info()
@@ -17,13 +19,15 @@ def mainlist(item):
thumb_pelis=get_thumb("channels_movie.png")
thumb_series=get_thumb("channels_tvshow.png")
+ thumb_search = get_thumb("search.png")
- itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url="http://www.newpct1.com/",
+ itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url=host,
extra="peliculas", thumbnail=thumb_pelis ))
- itemlist.append(Item(channel=item.channel, action="submenu", title="Series", url="http://www.newpct1.com/", extra="series",
+ itemlist.append(Item(channel=item.channel, action="submenu", title="Series", url=host, extra="series",
thumbnail=thumb_series))
- # itemlist.append(Item(channel=item.channel, action="search", title="Buscar"))
+ itemlist.append(
+ Item(channel=item.channel, action="search", title="Buscar", url=host + "buscar", thumbnail=thumb_search))
return itemlist
@@ -96,7 +100,7 @@ def alfabeto(item):
title = scrapedtitle.upper()
url = scrapedurl
- itemlist.append(Item(channel=item.channel, action="completo", title=title, url=url, extra=item.extra))
+ itemlist.append(Item(channel=item.channel, action="listado", title=title, url=url, extra=item.extra))
return itemlist
@@ -105,13 +109,23 @@ def listado(item):
logger.info()
# logger.info("[newpct1.py] listado url=" + item.url)
itemlist = []
+ url_next_page =''
data = re.sub(r"\n|\r|\t|\s{2}|()", "", httptools.downloadpage(item.url).data)
data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8")
+ #logger.debug(data)
+ logger.debug('item.modo: %s'%item.modo)
+ logger.debug('item.extra: %s'%item.extra)
- patron = '