diff --git a/plugin.video.alfa/channels/clasicofilm.py b/plugin.video.alfa/channels/clasicofilm.py index 084e3661..c2ea58fc 100755 --- a/plugin.video.alfa/channels/clasicofilm.py +++ b/plugin.video.alfa/channels/clasicofilm.py @@ -2,13 +2,11 @@ import re -from core import filetools from core import jsontools from core import httptools from core import scrapertools from core import servertools from core import tmdb -from core import videolibrarytools from core.item import Item from platformcode import config, platformtools, logger from channelselector import get_thumb @@ -32,19 +30,16 @@ else: def mainlist(item): logger.info() itemlist = [] - itemlist.append(item.clone(title="Películas", text_color=color2, action="", text_bold=True)) itemlist.append(item.clone(action="peliculas", title=" Novedades", - url="http://www.clasicofilm.com/feeds/posts/summary?start-index=1&max-results=20&alt=json-in-script&callback=finddatepost", + url = host + "feeds/posts/summary?start-index=1&max-results=20&alt=json-in-script&callback=finddatepost", thumbnail=get_thumb('newest', auto=True), text_color=color1)) itemlist.append(item.clone(action="generos", title=" Por géneros", url=host, thumbnail=get_thumb('genres', auto=True), text_color=color1)) - itemlist.append(item.clone(title="", action="")) itemlist.append(item.clone(action="search", title="Buscar...", text_color=color3, thumbnail=get_thumb('search', auto=True))) itemlist.append(item.clone(action="configuracion", title="Configurar canal...", text_color="gold", folder=False)) - return itemlist @@ -56,7 +51,6 @@ def configuracion(item): def search(item, texto): logger.info() - data = httptools.downloadpage(host).data texto = texto.replace(" ", "%20") item.url = host + "search?q=%s" % texto try: @@ -75,20 +69,17 @@ def newest(categoria): item = Item() try: if categoria == 'peliculas': - item.url = "http://www.clasicofilm.com/feeds/posts/summary?start-index=1&max-results=20&alt=json-in-script&callback=finddatepost" + item.url = host + "feeds/posts/summary?start-index=1&max-results=20&alt=json-in-script&callback=finddatepost" item.action = "peliculas" itemlist = peliculas(item) - if itemlist[-1].action == "peliculas": itemlist.pop() - # Se captura la excepción, para no interrumpir al canal novedades si un canal falla except: import sys for line in sys.exc_info(): logger.error("{0}".format(line)) return [] - return itemlist @@ -96,13 +87,10 @@ def peliculas(item): logger.info() itemlist = [] item.text_color = color2 - # Descarga la página data = httptools.downloadpage(item.url).data - data = scrapertools.find_single_match(data, 'finddatepost\((\{.*?\]\}\})\);') data = jsontools.load(data)["feed"] - for entry in data["entry"]: for link in entry["link"]: if link["rel"] == "alternate": @@ -124,17 +112,12 @@ def peliculas(item): url=url, thumbnail=thumbnail, infoLabels=infolabels, contentTitle=fulltitle, contentType="movie") itemlist.append(new_item) - - try: - tmdb.set_infoLabels(itemlist, __modo_grafico__) - except: - pass + tmdb.set_infoLabels(itemlist, __modo_grafico__) actualpage = int(scrapertools.find_single_match(item.url, 'start-index=(\d+)')) totalresults = int(data["openSearch$totalResults"]["$t"]) if actualpage + 20 < totalresults: url_next = item.url.replace("start-index=" + str(actualpage), "start-index=" + str(actualpage + 20)) itemlist.append(Item(channel=item.channel, action=item.action, title=">> Página Siguiente", url=url_next)) - return itemlist @@ -163,7 +146,6 @@ def busqueda(item): def generos(item): logger.info() itemlist = [] - # Descarga la página data = httptools.downloadpage(item.url).data patron = '([^<]+)\s*