diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index 5153f289..ef3bfdef 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -8,19 +8,17 @@ from platformcode import config, logger host = "http://allcalidad.com/" - def mainlist(item): logger.info() itemlist = [] - itemlist.append(Item(channel=item.channel, title="Novedades", action="peliculas", url=host)) - itemlist.append(Item(channel=item.channel, title="Por género", action="generos_years", url=host, extra="Genero")) - itemlist.append(Item(channel=item.channel, title="Por año", action="generos_years", url=host, extra=">Año<")) - itemlist.append(Item(channel=item.channel, title="Favoritas", action="peliculas", url=host + "/favorites")) - itemlist.append(Item(channel=item.channel, title="")) - itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + "?s=")) + itemlist.append(Item(channel = item.channel, title = "Novedades", action = "peliculas", url = host)) + itemlist.append(Item(channel = item.channel, title = "Por género", action = "generos_years", url = host, extra = "Genero" )) + itemlist.append(Item(channel = item.channel, title = "Por año", action = "generos_years", url = host, extra = ">Año<")) + itemlist.append(Item(channel = item.channel, title = "Favoritas", action = "peliculas", url = host + "/favorites" )) + itemlist.append(Item(channel = item.channel, title = "")) + itemlist.append(Item(channel = item.channel, title = "Buscar", action = "search", url = host + "?s=")) return itemlist - def newest(categoria): logger.info() itemlist = [] @@ -57,16 +55,16 @@ def generos_years(item): logger.info() itemlist = [] data = httptools.downloadpage(item.url).data - patron = '(?s)%s(.*?)' % item.extra + patron = '(?s)%s(.*?)' %item.extra bloque = scrapertools.find_single_match(data, patron) - patron = 'href="([^"]+)' + patron = 'href="([^"]+)' patron += '">([^<]+)' matches = scrapertools.find_multiple_matches(bloque, patron) for url, titulo in matches: - itemlist.append(Item(channel=item.channel, - action="peliculas", - title=titulo, - url=url + itemlist.append(Item(channel = item.channel, + action = "peliculas", + title = titulo, + url = url )) return itemlist @@ -86,22 +84,22 @@ def peliculas(item): year = scrapertools.find_single_match(varios, 'Año.*?kinopoisk">([^<]+)') year = scrapertools.find_single_match(year, '[0-9]{4}') mtitulo = titulo + " (" + idioma + ") (" + year + ")" - new_item = Item(channel=item.channel, - action="findvideos", - title=mtitulo, - fulltitle=titulo, - thumbnail=thumbnail, - url=url, - contentTitle=titulo, - contentType="movie" - ) + new_item = Item(channel = item.channel, + action = "findvideos", + title = mtitulo, + fulltitle = titulo, + thumbnail = thumbnail, + url = url, + contentTitle = titulo, + contentType="movie" + ) if year: new_item.infoLabels['year'] = int(year) itemlist.append(new_item) url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)') if url_pagina != "": pagina = "Pagina: " + scrapertools.find_single_match(url_pagina, "page/([0-9]+)") - itemlist.append(Item(channel=item.channel, action="peliculas", title=pagina, url=url_pagina)) + itemlist.append(Item(channel = item.channel, action = "peliculas", title = pagina, url = url_pagina)) return itemlist @@ -120,25 +118,24 @@ def findvideos(item): elif "vimeo" in url: url += "|" + "http://www.allcalidad.com" itemlist.append( - Item(channel=item.channel, - action="play", - title=titulo, - fulltitle=item.fulltitle, - thumbnail=item.thumbnail, - server=server, - url=url + Item(channel = item.channel, + action = "play", + title = titulo, + fulltitle = item.fulltitle, + thumbnail = item.thumbnail, + server = "", + url = url )) itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize()) if itemlist: - itemlist.append(Item(channel=item.channel)) + itemlist.append(Item(channel = item.channel)) itemlist.append(item.clone(channel="trailertools", title="Buscar Tráiler", action="buscartrailer", context="", text_color="magenta")) # Opción "Añadir esta película a la biblioteca de KODI" if item.extra != "library": if config.get_videolibrary_support(): itemlist.append(Item(channel=item.channel, title="Añadir a la videoteca", text_color="green", - filtro=True, action="add_pelicula_to_library", url=item.url, - thumbnail=item.thumbnail, + filtro=True, action="add_pelicula_to_library", url=item.url, thumbnail = item.thumbnail, infoLabels={'title': item.fulltitle}, fulltitle=item.fulltitle, extra="library")) return itemlist