From 768dcfb6104a29c2613e429506f9a04f83833d04 Mon Sep 17 00:00:00 2001 From: alaquepasa <39385022+alaquepasa@users.noreply.github.com> Date: Sat, 19 May 2018 12:15:38 +0200 Subject: [PATCH 1/6] [SeriesPapaya] Proteger de error el search() sin resultados --- plugin.video.alfa/channels/seriespapaya.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/seriespapaya.py b/plugin.video.alfa/channels/seriespapaya.py index 13d02b25..8a8f09c4 100644 --- a/plugin.video.alfa/channels/seriespapaya.py +++ b/plugin.video.alfa/channels/seriespapaya.py @@ -177,7 +177,10 @@ def search(item, texto): logger.info("texto: %s" % texto) data = httptools.downloadpage(urlparse.urljoin(HOST, "/buscar.php?term=%s" % texto)).data data_dict = jsontools.load(data) - tvshows = data_dict["myData"] + try: + tvshows = data_dict["myData"] + except: + return [] return [item.clone(action="episodios", title=show["titulo"], From beebd679622fc84d4c138907d054cb6a73256b66 Mon Sep 17 00:00:00 2001 From: alaquepasa <39385022+alaquepasa@users.noreply.github.com> Date: Sat, 19 May 2018 12:16:56 +0200 Subject: [PATCH 2/6] =?UTF-8?q?[SeriesPapaya]=20Activar=20busqueda=20globa?= =?UTF-8?q?l=20por=20defecto=20y=20a=C3=B1adir=20filtrado=20por=20tipo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/seriespapaya.json | 31 +++++++++------- plugin.video.alfa/channels/seriespapaya.py | 39 +++++++++++++------- 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/plugin.video.alfa/channels/seriespapaya.json b/plugin.video.alfa/channels/seriespapaya.json index 7f0acff1..55c10596 100755 --- a/plugin.video.alfa/channels/seriespapaya.json +++ b/plugin.video.alfa/channels/seriespapaya.json @@ -11,6 +11,14 @@ "anime" ], "settings": [ + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": true, + "enabled": true, + "visible": true + }, { "id": "filter_languages", "type": "list", @@ -28,20 +36,17 @@ ] }, { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": true, + "id": "filterlinks", + "type": "list", + "label": "Mostrar enlaces de tipo...", + "default": 2, "enabled": true, - "visible": true - }, - { - "id": "include_in_newest_series", - "type": "bool", - "label": "Incluir en Novedades - Episodios de series", - "default": true, - "enabled": true, - "visible": true + "visible": true, + "lvalues": [ + "Solo Descarga", + "Solo Online", + "No filtrar" + ] } ] } diff --git a/plugin.video.alfa/channels/seriespapaya.py b/plugin.video.alfa/channels/seriespapaya.py index 8a8f09c4..bfdab784 100644 --- a/plugin.video.alfa/channels/seriespapaya.py +++ b/plugin.video.alfa/channels/seriespapaya.py @@ -206,23 +206,34 @@ def findvideos(item): links = re.findall(expr, data, re.MULTILINE | re.DOTALL) - itemlist = [item.clone( - action="play", - title="{linkType} en {server} [{lang}] [{quality}] ({uploader}: {date})".format( - linkType="Ver" if linkType != "descargar" else "Descargar", - lang=IDIOMAS.get(lang, lang), - date=date, - server=server.rstrip(), - quality=quality, - uploader=uploader), - server=server.rstrip(), - url=urlparse.urljoin(HOST, url), - language=IDIOMAS.get(lang,lang), - quality=quality - ) for lang, date, server, url, linkType, quality, uploader in links] + itemlist = [] + try: + filtro_enlaces = config.get_setting("filterlinks", item.channel) + except: + filtro_enlaces = 2 + typeListStr = ["Descargar", "Ver"] + for lang, date, server, url, linkType, quality, uploader in links: + linkTypeNum = 0 if linkType == "descargar" else 1 + if filtro_enlaces != 2 and filtro_enlaces != linkTypeNum: + continue + itemlist.append(item.clone( + action="play", + title="{linkType} en {server} [{lang}] [{quality}] ({uploader}: {date})".format( + linkType=typeListStr[linkTypeNum], + lang=IDIOMAS.get(lang, lang), + date=date, + server=server.rstrip(), + quality=quality, + uploader=uploader), + server=server.rstrip(), + url=urlparse.urljoin(HOST, url), + language=IDIOMAS.get(lang,lang), + quality=quality + ) + ) # Requerido para FilterTools From b75bf8537f6d0ac688bb4ac42a86ea1f899bbc82 Mon Sep 17 00:00:00 2001 From: alaquepasa <39385022+alaquepasa@users.noreply.github.com> Date: Sat, 19 May 2018 12:17:45 +0200 Subject: [PATCH 3/6] =?UTF-8?q?[SeriesDanko]=20A=C3=B1adir=20filtrado=20po?= =?UTF-8?q?r=20tipo,=20a=C3=B1adir=20en=20novedades,=20recuperar=20filtert?= =?UTF-8?q?ools?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin.video.alfa/channels/seriesdanko.json | 23 +++++++++++++++- plugin.video.alfa/channels/seriesdanko.py | 30 ++++++++++++++++----- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/plugin.video.alfa/channels/seriesdanko.json b/plugin.video.alfa/channels/seriesdanko.json index 4e70b493..e90a9e48 100755 --- a/plugin.video.alfa/channels/seriesdanko.json +++ b/plugin.video.alfa/channels/seriesdanko.json @@ -15,7 +15,15 @@ "id": "include_in_global_search", "type": "bool", "label": "Incluir en busqueda global", - "default": false, + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_series", + "type": "bool", + "label": "Incluir en Novedades - Episodios de series", + "default": true, "enabled": true, "visible": true }, @@ -33,6 +41,19 @@ "VO", "VOS" ] + }, + { + "id": "filterlinks", + "type": "list", + "label": "Mostrar enlaces de tipo...", + "default": 2, + "enabled": true, + "visible": true, + "lvalues": [ + "Solo Descarga", + "Solo Online", + "No filtrar" + ] } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/seriesdanko.py b/plugin.video.alfa/channels/seriesdanko.py index 858a1ae7..046c9283 100644 --- a/plugin.video.alfa/channels/seriesdanko.py +++ b/plugin.video.alfa/channels/seriesdanko.py @@ -33,12 +33,20 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url=urlparse.urljoin(HOST, "all.php"))) - #itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES) + itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES) autoplay.show_option(item.channel, itemlist) return itemlist +def newest(categoria): + logger.info("categoria: %s" % categoria) + itemlist = [] + + if categoria == 'series': + itemlist = novedades(Item(channel="seriesdanko", title="Novedades", action="novedades", url=HOST)) + + return itemlist def novedades(item): logger.info() @@ -220,7 +228,7 @@ def episodios(item): infoLabels=infoLabels)) - #itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES) + itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) # Opción "Añadir esta serie a la videoteca de XBMC" @@ -241,14 +249,24 @@ def findvideos(item): online = re.findall('(.+?)
', data, re.MULTILINE | re.DOTALL) - itemlist = parse_videos(item, "Ver", online[0]) - itemlist.extend(parse_videos(item, "Descargar", online[1])) + itemlist = [] + + try: + filtro_enlaces = config.get_setting("filterlinks", item.channel) + except: + filtro_enlaces = 2 + + + if filtro_enlaces != 0: + itemlist.extend(parse_videos(item, "Ver", online[0])) + + if filtro_enlaces != 1: + itemlist.extend(parse_videos(item, "Descargar", online[1])) - itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES) # Requerido para FilterTools - itemlist = filtertools.get_links(itemlist, item, list_idiomas) + itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES) # Requerido para AutoPlay From c80535972012a803ede5801b9ddcc538b76f7733 Mon Sep 17 00:00:00 2001 From: alaquepasa <39385022+alaquepasa@users.noreply.github.com> Date: Sat, 19 May 2018 12:20:47 +0200 Subject: [PATCH 4/6] [SeriesPapaya] Activar salir en Novedades --- plugin.video.alfa/channels/seriespapaya.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugin.video.alfa/channels/seriespapaya.json b/plugin.video.alfa/channels/seriespapaya.json index 55c10596..010b4296 100755 --- a/plugin.video.alfa/channels/seriespapaya.json +++ b/plugin.video.alfa/channels/seriespapaya.json @@ -19,6 +19,14 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_series", + "type": "bool", + "label": "Incluir en Novedades - Episodios de series", + "default": true, + "enabled": true, + "visible": true + }, { "id": "filter_languages", "type": "list", From 775984740008d60e1e0621f78c50a78f842bfc05 Mon Sep 17 00:00:00 2001 From: alaquepasa <39385022+alaquepasa@users.noreply.github.com> Date: Sat, 19 May 2018 17:02:39 +0200 Subject: [PATCH 5/6] Simplificar newest() de seriesdanko y seriespapaya --- plugin.video.alfa/channels/seriesdanko.py | 2 +- plugin.video.alfa/channels/seriespapaya.py | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/plugin.video.alfa/channels/seriesdanko.py b/plugin.video.alfa/channels/seriesdanko.py index 046c9283..c9df2bca 100644 --- a/plugin.video.alfa/channels/seriesdanko.py +++ b/plugin.video.alfa/channels/seriesdanko.py @@ -44,7 +44,7 @@ def newest(categoria): itemlist = [] if categoria == 'series': - itemlist = novedades(Item(channel="seriesdanko", title="Novedades", action="novedades", url=HOST)) + itemlist = novedades(Item()) return itemlist diff --git a/plugin.video.alfa/channels/seriespapaya.py b/plugin.video.alfa/channels/seriespapaya.py index bfdab784..ddbc644f 100644 --- a/plugin.video.alfa/channels/seriespapaya.py +++ b/plugin.video.alfa/channels/seriespapaya.py @@ -132,17 +132,7 @@ def newest(categoria): if categoria != 'series': return [] - try: - return novedades(Item()) - - # 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("%s" % line) - - return [] - + return novedades(Item()) def episodios(item): logger.info("url: %s" % item.url) From b2e0cf72aca77f7a2a57b70cf372809eb9f3e8ff Mon Sep 17 00:00:00 2001 From: alaquepasa <39385022+alaquepasa@users.noreply.github.com> Date: Sat, 19 May 2018 17:05:01 +0200 Subject: [PATCH 6/6] Fix newest on seriesdanko --- plugin.video.alfa/channels/seriesdanko.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/seriesdanko.py b/plugin.video.alfa/channels/seriesdanko.py index c9df2bca..08f9310a 100644 --- a/plugin.video.alfa/channels/seriesdanko.py +++ b/plugin.video.alfa/channels/seriesdanko.py @@ -44,7 +44,7 @@ def newest(categoria): itemlist = [] if categoria == 'series': - itemlist = novedades(Item()) + itemlist = novedades(Item(url = HOST)) return itemlist