From 44a89836d5dd34982862efeeef9e54366b2169ac Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:21:19 -0500 Subject: [PATCH 01/26] Update allcalidad.json --- plugin.video.alfa/channels/allcalidad.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/plugin.video.alfa/channels/allcalidad.json b/plugin.video.alfa/channels/allcalidad.json index 5c35e0cf..1d553516 100755 --- a/plugin.video.alfa/channels/allcalidad.json +++ b/plugin.video.alfa/channels/allcalidad.json @@ -19,6 +19,14 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_global_search", "type": "bool", From c5d1bc19887a8307491f0711a053f23d8d7a6c16 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:22:36 -0500 Subject: [PATCH 02/26] Update allcalidad.py --- plugin.video.alfa/channels/allcalidad.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index 8a64360a..04d73f46 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -33,7 +33,7 @@ def newest(categoria): itemlist = [] item = Item() try: - if categoria == 'peliculas': + if categoria in ['peliculas','latino']: item.url = host elif categoria == 'infantiles': item.url = host + 'category/animacion/' From ddda31b2af0063500f83f3d1b5ba8a2c0ea0beef Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:23:46 -0500 Subject: [PATCH 03/26] Update news.py --- plugin.video.alfa/channels/news.py | 33 +++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py index 9fd12030..5a9b7ea3 100644 --- a/plugin.video.alfa/channels/news.py +++ b/plugin.video.alfa/channels/news.py @@ -74,6 +74,26 @@ def mainlist(item): set_category_context(new_item) itemlist.append(new_item) + # if list_canales['Castellano']: + thumbnail = get_thumb("channels_documentary.png") + new_item = Item(channel=item.channel, action="novedades", extra="castellano", title="Castellano", + thumbnail=thumbnail) + set_category_context(new_item) + itemlist.append(new_item) + + # if list_canales['Latino']: + thumbnail = get_thumb("channels_documentary.png") + new_item = Item(channel=item.channel, action="novedades", extra="latino", title="Latino", + thumbnail=thumbnail) + set_category_context(new_item) + itemlist.append(new_item) + + # if list_canales['Torrent']: + thumbnail = get_thumb("channels_documentary.png") + new_item = Item(channel=item.channel, action="novedades", extra="torrent", title="Torrent", thumbnail=thumbnail) + set_category_context(new_item) + itemlist.append(new_item) + #if list_canales['documentales']: thumbnail = get_thumb("channels_documentary.png") new_item = Item(channel=item.channel, action="novedades", extra="documentales", title="Documentales", @@ -95,7 +115,8 @@ def set_category_context(item): def get_channels_list(): logger.info() - list_canales = {'peliculas': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [], 'documentales': []} + list_canales = {'peliculas': [], 'terror': [], 'infantiles': [], 'series': [], 'anime': [], + 'castellano': [], 'latino':[], 'torrent':[], 'documentales': []} any_active = False # Rellenar listas de canales disponibles channels_path = os.path.join(config.get_runtime_path(), "channels", '*.json') @@ -419,6 +440,16 @@ def menu_opciones(item): title=" - Episodios de anime", thumbnail=get_thumb("channels_anime.png"), folder=False)) + itemlist.append( + Item(channel=item.channel, action="setting_channel", extra="castellano", title=" - Castellano", + thumbnail=get_thumb("channels_documentary.png"), folder=False)) + + itemlist.append(Item(channel=item.channel, action="setting_channel", extra="latino", title=" - Latino", + thumbnail=get_thumb("channels_documentary.png"), folder=False)) + + itemlist.append(Item(channel=item.channel, action="setting_channel", extra="Torrent", title=" - Torrent", + thumbnail=get_thumb("channels_documentary.png"), folder=False)) + itemlist.append(Item(channel=item.channel, action="setting_channel", extra="documentales", title=" - Documentales", thumbnail=get_thumb("channels_documentary.png"), From 537c2cb0e427e59cd22a9653f5408f007df01673 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:30:58 -0500 Subject: [PATCH 04/26] Update allpeliculas.json --- plugin.video.alfa/channels/allpeliculas.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/allpeliculas.json b/plugin.video.alfa/channels/allpeliculas.json index 2574c95b..5338fb45 100755 --- a/plugin.video.alfa/channels/allpeliculas.json +++ b/plugin.video.alfa/channels/allpeliculas.json @@ -20,6 +20,14 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_newest_peliculas", "type": "bool", @@ -50,4 +58,4 @@ ] } ] -} \ No newline at end of file +} From 513d66dfb4f60eaee886a0222d1954ba190d7c54 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:31:36 -0500 Subject: [PATCH 05/26] Update allpeliculas.py --- plugin.video.alfa/channels/allpeliculas.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/allpeliculas.py b/plugin.video.alfa/channels/allpeliculas.py index 06175ca6..591163c3 100644 --- a/plugin.video.alfa/channels/allpeliculas.py +++ b/plugin.video.alfa/channels/allpeliculas.py @@ -217,7 +217,7 @@ def newest(categoria): itemlist = [] item = Item() try: - if categoria == "peliculas": + if categoria in ['peliculas','latino']: item.url = host + "movies/newmovies?page=1" item.action = "lista" itemlist = lista(item) From 9adb713d07f68fd0a18f1f48b711f8f7b94750b0 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:42:14 -0500 Subject: [PATCH 06/26] Update cinefoxtv.json --- plugin.video.alfa/channels/cinefoxtv.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/cinefoxtv.json b/plugin.video.alfa/channels/cinefoxtv.json index dfa107be..54bb5891 100755 --- a/plugin.video.alfa/channels/cinefoxtv.json +++ b/plugin.video.alfa/channels/cinefoxtv.json @@ -18,6 +18,14 @@ "enabled": false, "visible": false }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_newest_peliculas", "type": "bool", @@ -35,4 +43,4 @@ "visible": true } ] -} \ No newline at end of file +} From 42d20e9434d91498a78dc24285af92ee67395238 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:42:30 -0500 Subject: [PATCH 07/26] Update cinefoxtv.py --- plugin.video.alfa/channels/cinefoxtv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/cinefoxtv.py b/plugin.video.alfa/channels/cinefoxtv.py index 5a33d19a..ef97f240 100644 --- a/plugin.video.alfa/channels/cinefoxtv.py +++ b/plugin.video.alfa/channels/cinefoxtv.py @@ -193,7 +193,7 @@ def newest(categoria): item = Item() # categoria='peliculas' try: - if categoria == 'peliculas': + if categoria in ['peliculas','latino']: item.url = host + 'page/1.html' elif categoria == 'infantiles': item.url = host + 'peliculas-de-genero/infantil/1.html' From 476f7f985de75a4dae9156b6ae04fa2d63c08392 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:47:07 -0500 Subject: [PATCH 08/26] Update estadepelis.json --- plugin.video.alfa/channels/estadepelis.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/estadepelis.json b/plugin.video.alfa/channels/estadepelis.json index 0a9c7ec0..5c75dc13 100755 --- a/plugin.video.alfa/channels/estadepelis.json +++ b/plugin.video.alfa/channels/estadepelis.json @@ -31,6 +31,14 @@ "VOS" ] }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_newest_peliculas", "type": "bool", @@ -56,4 +64,4 @@ "visible": true } ] -} \ No newline at end of file +} From f5a5979f7473aaf2d4706f99031269e7cf792c59 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:48:02 -0500 Subject: [PATCH 09/26] Update estadepelis.py --- plugin.video.alfa/channels/estadepelis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/estadepelis.py b/plugin.video.alfa/channels/estadepelis.py index a592c8f3..1b4fc936 100755 --- a/plugin.video.alfa/channels/estadepelis.py +++ b/plugin.video.alfa/channels/estadepelis.py @@ -457,7 +457,7 @@ def newest(categoria): item = Item() # categoria='peliculas' try: - if categoria == 'peliculas': + if categoria in ['peliculas','latino']: item.url = host elif categoria == 'infantiles': item.url = host + 'search?q=animación' From 39669395ae877632c1f2f50152742ea636f9cd57 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:53:50 -0500 Subject: [PATCH 10/26] Update miradetodo.json --- plugin.video.alfa/channels/miradetodo.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/miradetodo.json b/plugin.video.alfa/channels/miradetodo.json index 16a9821b..03bc898b 100755 --- a/plugin.video.alfa/channels/miradetodo.json +++ b/plugin.video.alfa/channels/miradetodo.json @@ -18,6 +18,14 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_newest_peliculas", "type": "bool", @@ -35,4 +43,4 @@ "visible": true } ] -} \ No newline at end of file +} From 5bf145114d8c58b423d16637d1daa363fb581ed7 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:54:07 -0500 Subject: [PATCH 11/26] Update miradetodo.py --- plugin.video.alfa/channels/miradetodo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/miradetodo.py b/plugin.video.alfa/channels/miradetodo.py index 35110b07..78243829 100755 --- a/plugin.video.alfa/channels/miradetodo.py +++ b/plugin.video.alfa/channels/miradetodo.py @@ -382,7 +382,7 @@ def newest(categoria): itemlist = [] item = Item() try: - if categoria == 'peliculas': + if categoria in ['peliculas','latino']: item.url = host + 'page/1/?s' elif categoria == 'infantiles': From 4c24fe48ed21d8e364583bfeecafb552ec882d25 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:56:12 -0500 Subject: [PATCH 12/26] Update ohlatino.json --- plugin.video.alfa/channels/ohlatino.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/ohlatino.json b/plugin.video.alfa/channels/ohlatino.json index 7d50a531..1e39fd1a 100644 --- a/plugin.video.alfa/channels/ohlatino.json +++ b/plugin.video.alfa/channels/ohlatino.json @@ -18,6 +18,14 @@ "enabled": false, "visible": false }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_newest_peliculas", "type": "bool", @@ -35,4 +43,4 @@ "visible": true } ] -} \ No newline at end of file +} From 162928f4d69c4f70993765208e163d4d4e9f382a Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 09:56:54 -0500 Subject: [PATCH 13/26] Update ohlatino.py --- plugin.video.alfa/channels/ohlatino.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.video.alfa/channels/ohlatino.py b/plugin.video.alfa/channels/ohlatino.py index 0e2c41a1..11a08812 100644 --- a/plugin.video.alfa/channels/ohlatino.py +++ b/plugin.video.alfa/channels/ohlatino.py @@ -183,7 +183,7 @@ def newest(categoria): logger.info() item = Item() try: - if categoria == 'peliculas': + if categoria in ['peliculas','latino']: item.url = host + '/release/2017/' elif categoria == 'infantiles': From 164804d4845ad3d2e3ecca61aa0172b64eca3efc Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 10:08:38 -0500 Subject: [PATCH 14/26] Update peliculasaudiolatino.json --- .../channels/peliculasaudiolatino.json | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/peliculasaudiolatino.json b/plugin.video.alfa/channels/peliculasaudiolatino.json index 52d788ce..134f5aef 100755 --- a/plugin.video.alfa/channels/peliculasaudiolatino.json +++ b/plugin.video.alfa/channels/peliculasaudiolatino.json @@ -10,13 +10,45 @@ "movie" ], "settings": [ + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_global_search", "type": "bool", "label": "Incluir en busqueda global", - "default": false, + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_infantiles", + "type": "bool", + "label": "Incluir en Novedades - Infantiles", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, "enabled": true, "visible": true } ] -} \ No newline at end of file +} From feb4f239e3229c46b80817ba164fc52767adb7f6 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 10:09:36 -0500 Subject: [PATCH 15/26] Update peliculasaudiolatino.py --- .../channels/peliculasaudiolatino.py | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/plugin.video.alfa/channels/peliculasaudiolatino.py b/plugin.video.alfa/channels/peliculasaudiolatino.py index 197cc18c..8ab94e70 100644 --- a/plugin.video.alfa/channels/peliculasaudiolatino.py +++ b/plugin.video.alfa/channels/peliculasaudiolatino.py @@ -31,6 +31,29 @@ def mainlist(item): return itemlist +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria in ['peliculas','latino']: + item.url = HOST + elif categoria == 'infantiles': + item.url = HOST + '/genero/animacion.html' + elif categoria == 'terror': + item.url = HOST + '/genero/terror.html' + itemlist = peliculas(item) + if "Pagina" in itemlist[-1].title: + itemlist.pop() + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] + + return itemlist + + def peliculas(item): logger.info() From 52245474468499b7b594964e47ebf114295ced9d Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 10:24:36 -0500 Subject: [PATCH 16/26] Update peliculasmx.json --- plugin.video.alfa/channels/peliculasmx.json | 36 +++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/plugin.video.alfa/channels/peliculasmx.json b/plugin.video.alfa/channels/peliculasmx.json index 29e1167b..8a1ffeb3 100755 --- a/plugin.video.alfa/channels/peliculasmx.json +++ b/plugin.video.alfa/channels/peliculasmx.json @@ -10,13 +10,45 @@ "movie" ], "settings": [ + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_global_search", "type": "bool", "label": "Incluir en busqueda global", - "default": false, + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_infantiles", + "type": "bool", + "label": "Incluir en Novedades - Infantiles", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, "enabled": true, "visible": true } ] -} \ No newline at end of file +} From 48740f4a1d706fe3ba81535b21d81af11e5078e7 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Fri, 17 Nov 2017 10:25:14 -0500 Subject: [PATCH 17/26] Update peliculasmx.py --- plugin.video.alfa/channels/peliculasmx.py | 37 +++++++++++++++++------ 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/plugin.video.alfa/channels/peliculasmx.py b/plugin.video.alfa/channels/peliculasmx.py index 81ccd672..90e211ca 100644 --- a/plugin.video.alfa/channels/peliculasmx.py +++ b/plugin.video.alfa/channels/peliculasmx.py @@ -10,28 +10,47 @@ from core.item import Item from platformcode import logger - +host = "http://www.peliculasmx.net" def mainlist(item): logger.info() itemlist = [] itemlist.append( - Item(channel=item.channel, title="Últimas añadidas", action="peliculas", url="http://www.peliculasmx.net/")) + Item(channel=item.channel, title="Últimas añadidas", action="peliculas", url=host)) itemlist.append( - Item(channel=item.channel, title="Últimas por género", action="generos", url="http://www.peliculasmx.net/")) - itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url="http://www.peliculasmx.net/")) + Item(channel=item.channel, title="Últimas por género", action="generos", url=host)) + itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", url=host)) + return itemlist + + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria in ['peliculas','latino']: + item.url = host + elif categoria == 'infantiles': + item.url = host + '/category/animacion/' + elif categoria == 'terror': + item.url = host + '/category/terror/' + itemlist = peliculas(item) + if "Pagina" in itemlist[-1].title: + itemlist.pop() + except: + import sys + for line in sys.exc_info(): + logger.error("{0}".format(line)) + return [] + return itemlist def generos(item): logger.info() itemlist = [] - - # Descarga la página data = httptools.downloadpage(item.url).data - logger.debug(data) - #