From 76f52ce404bf9f812478cc973a22ddad4df1138a Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 17 Nov 2017 17:01:06 -0300 Subject: [PATCH 1/3] cambios para news --- plugin.video.alfa/channels/alltorrent.json | 8 +++ plugin.video.alfa/channels/alltorrent.py | 24 ++++++++ plugin.video.alfa/channels/cinecalidad.json | 16 +++++ plugin.video.alfa/channels/cinecalidad.py | 10 ++-- plugin.video.alfa/channels/cinetux.json | 24 ++++++++ plugin.video.alfa/channels/cinetux.py | 28 +++++---- plugin.video.alfa/channels/cuelgame.json | 8 +++ plugin.video.alfa/channels/cuelgame.py | 22 +++++++ plugin.video.alfa/channels/descargasmix.json | 8 +++ plugin.video.alfa/channels/descargasmix.py | 35 +++++++++++ plugin.video.alfa/channels/divxatope.json | 8 +++ plugin.video.alfa/channels/divxatope.py | 2 +- plugin.video.alfa/channels/divxtotal.json | 8 +++ plugin.video.alfa/channels/divxtotal.py | 23 +++++++ plugin.video.alfa/channels/doomtv.json | 8 +++ plugin.video.alfa/channels/doomtv.py | 2 +- plugin.video.alfa/channels/elitetorrent.json | 10 ++++ plugin.video.alfa/channels/elitetorrent.py | 21 +++++++ plugin.video.alfa/channels/gmobi.json | 16 +++++ plugin.video.alfa/channels/gmobi.py | 25 +++++++- plugin.video.alfa/channels/lacajita.json | 16 +++++ plugin.video.alfa/channels/lacajita.py | 17 +++++- plugin.video.alfa/channels/mejortorrent.json | 8 +++ plugin.video.alfa/channels/mejortorrent.py | 25 ++++++++ plugin.video.alfa/channels/miltorrents.json | 8 +++ plugin.video.alfa/channels/miltorrents.py | 25 ++++++++ plugin.video.alfa/channels/newpct1.json | 8 +++ plugin.video.alfa/channels/newpct1.py | 26 ++++++++ plugin.video.alfa/channels/news.py | 33 +++++++++- plugin.video.alfa/channels/peliculasdk.json | 8 +++ plugin.video.alfa/channels/peliculasdk.py | 22 +++++++ plugin.video.alfa/channels/peliculasnu.json | 16 +++++ plugin.video.alfa/channels/peliculasnu.py | 6 ++ plugin.video.alfa/channels/peliculasrey.json | 60 ++++++++++++++++++- plugin.video.alfa/channels/peliculasrey.py | 38 ++++++++++++ plugin.video.alfa/channels/peliscity.json | 60 ++++++++++++++++++- plugin.video.alfa/channels/peliscity.py | 38 ++++++++++++ plugin.video.alfa/channels/pelismagnet.json | 8 +++ plugin.video.alfa/channels/pelismagnet.py | 26 ++++++++ plugin.video.alfa/channels/pelismundo.json | 16 +++++ plugin.video.alfa/channels/pelismundo.py | 10 +++- plugin.video.alfa/channels/pelisplanet.json | 16 +++++ plugin.video.alfa/channels/pelisplanet.py | 5 ++ plugin.video.alfa/channels/tiotorrent.json | 8 +++ plugin.video.alfa/channels/tiotorrent.py | 12 +++- plugin.video.alfa/channels/torrentlocura.json | 24 +++++--- plugin.video.alfa/channels/torrentlocura.py | 27 +++++++++ .../channels/verpeliculasnuevas.json | 34 ++++++++++- .../channels/verpeliculasnuevas.py | 13 ++++ plugin.video.alfa/channels/verpelis.json | 16 +++++ plugin.video.alfa/channels/verpelis.py | 5 ++ plugin.video.alfa/channels/zonatorrent.json | 8 +++ plugin.video.alfa/channels/zonatorrent.py | 2 + 53 files changed, 912 insertions(+), 38 deletions(-) diff --git a/plugin.video.alfa/channels/alltorrent.json b/plugin.video.alfa/channels/alltorrent.json index e279dbd3..c627ebbb 100755 --- a/plugin.video.alfa/channels/alltorrent.json +++ b/plugin.video.alfa/channels/alltorrent.json @@ -25,6 +25,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/alltorrent.py b/plugin.video.alfa/channels/alltorrent.py index 85190bb6..34869367 100755 --- a/plugin.video.alfa/channels/alltorrent.py +++ b/plugin.video.alfa/channels/alltorrent.py @@ -54,6 +54,7 @@ def browser(url): api_key = "2e2160006592024ba87ccdf78c28f49f" api_fankey = "dffe90fba4d02c199ae7a9e71330c987" +host = 'http://alltorrent.net/' def mainlist(item): logger.info() @@ -392,3 +393,26 @@ def get_art(item): item.extra = item.extra + "|" + item.thumbnail else: item.extra = item.extra + "|" + item.thumbnail + + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = host + + itemlist = scraper(item) + + if itemlist[-1].action == "[COLOR olivedrab][B]Siguiente >>[/B][/COLOR]": + 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 diff --git a/plugin.video.alfa/channels/cinecalidad.json b/plugin.video.alfa/channels/cinecalidad.json index 3db32aac..9f31cf60 100755 --- a/plugin.video.alfa/channels/cinecalidad.json +++ b/plugin.video.alfa/channels/cinecalidad.json @@ -55,6 +55,22 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/cinecalidad.py b/plugin.video.alfa/channels/cinecalidad.py index 25902a51..34407b61 100644 --- a/plugin.video.alfa/channels/cinecalidad.py +++ b/plugin.video.alfa/channels/cinecalidad.py @@ -378,12 +378,14 @@ def newest(categoria): itemlist = [] item = Item() try: - if categoria == 'peliculas': - item.url = 'http://www.cinecalidad.to' + if categoria in ['peliculas','latino']: + item.url = 'http://www.cinecalidad.com' elif categoria == 'infantiles': - item.url = 'http://www.cinecalidad.to/genero-peliculas/infantil/' + item.url = 'http://www.cinecalidad.com/genero-peliculas/infantil/' elif categoria == 'terror': - item.url = 'http://www.cinecalidad.to/genero-peliculas/terror/' + item.url = 'http://www.cinecalidad.com/genero-peliculas/terror/' + elif categoria == 'castellano': + item.url = 'http://www.cinecalidad.com/espana/' itemlist = peliculas(item) if itemlist[-1].title == 'Página siguiente >>': itemlist.pop() diff --git a/plugin.video.alfa/channels/cinetux.json b/plugin.video.alfa/channels/cinetux.json index bf4d08eb..b3e3a7bd 100755 --- a/plugin.video.alfa/channels/cinetux.json +++ b/plugin.video.alfa/channels/cinetux.json @@ -44,6 +44,30 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "modo_grafico", "type": "bool", diff --git a/plugin.video.alfa/channels/cinetux.py b/plugin.video.alfa/channels/cinetux.py index 3bcc11e5..fdc61f6e 100644 --- a/plugin.video.alfa/channels/cinetux.py +++ b/plugin.video.alfa/channels/cinetux.py @@ -90,26 +90,30 @@ def newest(categoria): if categoria == 'peliculas': item.url = CHANNEL_HOST item.action = "peliculas" - itemlist = peliculas(item) - - if itemlist[-1].action == "peliculas": - itemlist.pop() elif categoria == 'documentales': item.url = CHANNEL_HOST + "genero/documental/" item.action = "peliculas" - itemlist = peliculas(item) - - if itemlist[-1].action == "peliculas": - itemlist.pop() elif categoria == 'infantiles': - item.url = CHANNEL_HOST + "genero/infantil/" + item.url = CHANNEL_HOST + "genero/animacion/" item.action = "peliculas" - itemlist = peliculas(item) - if itemlist[-1].action == "peliculas": - itemlist.pop() + elif categoria == 'terror': + item.url = CHANNEL_HOST + "genero/terror/" + item.action = "peliculas" + + elif categoria == 'castellano': + item.url = CHANNEL_HOST + "idioma/espanol/" + item.action = "peliculas" + + elif categoria == 'latino': + item.url = CHANNEL_HOST + "idioma/latino/" + 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: diff --git a/plugin.video.alfa/channels/cuelgame.json b/plugin.video.alfa/channels/cuelgame.json index 8e964bbf..0a40b064 100755 --- a/plugin.video.alfa/channels/cuelgame.json +++ b/plugin.video.alfa/channels/cuelgame.json @@ -21,6 +21,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/cuelgame.py b/plugin.video.alfa/channels/cuelgame.py index 0760121a..7e323deb 100755 --- a/plugin.video.alfa/channels/cuelgame.py +++ b/plugin.video.alfa/channels/cuelgame.py @@ -1223,3 +1223,25 @@ def browser(url): response = r.read() return response + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = 'http://cuelgame.net/?category=4' + + itemlist = scraper(item) + + if itemlist[-1].action == "Página siguiente >>": + 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 diff --git a/plugin.video.alfa/channels/descargasmix.json b/plugin.video.alfa/channels/descargasmix.json index c20c42a9..95890119 100644 --- a/plugin.video.alfa/channels/descargasmix.json +++ b/plugin.video.alfa/channels/descargasmix.json @@ -43,6 +43,14 @@ "default": false, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/descargasmix.py b/plugin.video.alfa/channels/descargasmix.py index cc49d16a..1fac7664 100644 --- a/plugin.video.alfa/channels/descargasmix.py +++ b/plugin.video.alfa/channels/descargasmix.py @@ -535,3 +535,38 @@ def get_data(url_orig, get_host=False): break return response.data + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = host+'/peliculas' + + itemlist = entradas(item) + if itemlist[-1].title == ">> Siguiente": + itemlist.pop() + + item.url = host + '/series' + + itemlist.extend(entradas(item)) + if itemlist[-1].title == ">> Siguiente": + itemlist.pop() + + item.url = host + '/anime' + + itemlist.extend(entradas(item)) + + + if itemlist[-1].title == ">> Siguiente": + 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 diff --git a/plugin.video.alfa/channels/divxatope.json b/plugin.video.alfa/channels/divxatope.json index 9c2603b5..8f70eb4a 100755 --- a/plugin.video.alfa/channels/divxatope.json +++ b/plugin.video.alfa/channels/divxatope.json @@ -35,6 +35,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/divxatope.py b/plugin.video.alfa/channels/divxatope.py index 71965fc9..276dd858 100644 --- a/plugin.video.alfa/channels/divxatope.py +++ b/plugin.video.alfa/channels/divxatope.py @@ -94,7 +94,7 @@ def newest(categoria): itemlist = [] item = Item() try: - if categoria == 'peliculas': + if categoria in ['peliculas', 'torrent']: item.url = "http://www.divxatope1.com/peliculas" elif categoria == 'series': diff --git a/plugin.video.alfa/channels/divxtotal.json b/plugin.video.alfa/channels/divxtotal.json index 208a9a23..56a954e0 100755 --- a/plugin.video.alfa/channels/divxtotal.json +++ b/plugin.video.alfa/channels/divxtotal.json @@ -26,6 +26,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/divxtotal.py b/plugin.video.alfa/channels/divxtotal.py index 889bd667..0163a61b 100644 --- a/plugin.video.alfa/channels/divxtotal.py +++ b/plugin.video.alfa/channels/divxtotal.py @@ -1020,3 +1020,26 @@ def ext_size(url): ext_v = ext_v + " -- No reproducible" size = "" return ext_v, size + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = 'http://www.divxtotal.com/peliculas/' + item.contentType="movie" + + itemlist = scraper(item) + + if itemlist[-1].title == "[COLOR springgreen][B]Siguiente >>[/B][/COLOR]": + 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 diff --git a/plugin.video.alfa/channels/doomtv.json b/plugin.video.alfa/channels/doomtv.json index f972754b..9845847f 100644 --- a/plugin.video.alfa/channels/doomtv.json +++ b/plugin.video.alfa/channels/doomtv.json @@ -55,6 +55,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/doomtv.py b/plugin.video.alfa/channels/doomtv.py index db8bf102..2bc1209f 100644 --- a/plugin.video.alfa/channels/doomtv.py +++ b/plugin.video.alfa/channels/doomtv.py @@ -202,7 +202,7 @@ def newest(categoria): item = Item() # categoria='peliculas' try: - if categoria == 'peliculas': + if categoria in ['peliculas', 'latino']: item.url = host +'peliculas/page/1' elif categoria == 'infantiles': item.url = host + 'categoria/animacion/' diff --git a/plugin.video.alfa/channels/elitetorrent.json b/plugin.video.alfa/channels/elitetorrent.json index b81aff68..a0044960 100644 --- a/plugin.video.alfa/channels/elitetorrent.json +++ b/plugin.video.alfa/channels/elitetorrent.json @@ -12,5 +12,15 @@ "tvshow", "documentary", "vos" + ], + "settings":[ + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true + } ] } diff --git a/plugin.video.alfa/channels/elitetorrent.py b/plugin.video.alfa/channels/elitetorrent.py index bd3c993e..66181660 100644 --- a/plugin.video.alfa/channels/elitetorrent.py +++ b/plugin.video.alfa/channels/elitetorrent.py @@ -105,3 +105,24 @@ def play(item): thumbnail=item.thumbnail, plot=item.plot, folder=False)) return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = 'http://www.elitetorrent.wesconference.net/categoria/2/peliculas/modo:mini' + + itemlist = peliculas(item) + if itemlist[-1].title == "Página siguiente >>": + 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 diff --git a/plugin.video.alfa/channels/gmobi.json b/plugin.video.alfa/channels/gmobi.json index 3c144db9..7407eb83 100644 --- a/plugin.video.alfa/channels/gmobi.json +++ b/plugin.video.alfa/channels/gmobi.json @@ -18,6 +18,22 @@ "default": false, "enabled": false, "visible": false + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/gmobi.py b/plugin.video.alfa/channels/gmobi.py index ebe6145e..bbf3a0c9 100644 --- a/plugin.video.alfa/channels/gmobi.py +++ b/plugin.video.alfa/channels/gmobi.py @@ -12,10 +12,11 @@ from core import tmdb from core.item import Item from platformcode import logger +host = 'http://gnula.mobi/' def mainlist(item): logger.info() itemlist = list() - itemlist.append(item.clone(title="Novedades", action="peliculas", url="http://gnula.mobi/")) + itemlist.append(item.clone(title="Novedades", action="peliculas", url=host)) itemlist.append(item.clone(title="Castellano", action="peliculas", url="http://www.gnula.mobi/tag/espanol/")) itemlist.append(item.clone(title="Latino", action="peliculas", url="http://gnula.mobi/tag/latino/")) @@ -113,3 +114,25 @@ def findvideos(item): def play(item): item.thumbnail = item.contentThumbnail return [item] + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'peliculas': + item.url = host + elif categoria == 'castellano': + item.url = host +'tag/espanol/' + elif categoria == 'latino': + item.url = host +'tag/latino/' + 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 diff --git a/plugin.video.alfa/channels/lacajita.json b/plugin.video.alfa/channels/lacajita.json index 380ab715..3a45314b 100755 --- a/plugin.video.alfa/channels/lacajita.json +++ b/plugin.video.alfa/channels/lacajita.json @@ -48,6 +48,22 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/lacajita.py b/plugin.video.alfa/channels/lacajita.py index 94dd3024..5788e369 100644 --- a/plugin.video.alfa/channels/lacajita.py +++ b/plugin.video.alfa/channels/lacajita.py @@ -265,14 +265,25 @@ def newest(categoria): logger.info() itemlist = [] item = Item() + item.page = 0 try: if categoria == "terror": item.url = host +"/listado/terror/" item.action = "updated" - item.page = 0 - itemlist = updated(item) + itemlist = updated(item) + elif categoria == 'castellano': + item.url = host + "/estrenos/es/" + item.action = "entradas" - if itemlist[-1].action == "updated": + elif categoria == 'latino': + item.url = host + "/estrenos/la/" + item.action = "entradas" + + if categoria != 'terror': + itemlist = entradas(item) + + + if itemlist[-1].action == item.action: itemlist.pop() # Se captura la excepción, para no interrumpir al canal novedades si un canal falla diff --git a/plugin.video.alfa/channels/mejortorrent.json b/plugin.video.alfa/channels/mejortorrent.json index e492c42c..a64f06e1 100755 --- a/plugin.video.alfa/channels/mejortorrent.json +++ b/plugin.video.alfa/channels/mejortorrent.json @@ -20,6 +20,14 @@ "default": false, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/mejortorrent.py b/plugin.video.alfa/channels/mejortorrent.py index 7f0c9c66..014562fd 100755 --- a/plugin.video.alfa/channels/mejortorrent.py +++ b/plugin.video.alfa/channels/mejortorrent.py @@ -423,3 +423,28 @@ def play(item): thumbnail=item.thumbnail, plot=item.plot, folder=False)) return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = 'http://www.mejortorrent.com/torrents-de-peliculas.html' + + itemlist = getlist(item) + if itemlist[-1].title == "Pagina siguiente >>": + itemlist.pop() + item.url = 'http://www.mejortorrent.com/torrents-de-series.html' + itemlist.extend(getlist(item)) + if itemlist[-1].title == "Pagina siguiente >>": + 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 diff --git a/plugin.video.alfa/channels/miltorrents.json b/plugin.video.alfa/channels/miltorrents.json index 08ac652c..b9bd1fed 100755 --- a/plugin.video.alfa/channels/miltorrents.json +++ b/plugin.video.alfa/channels/miltorrents.json @@ -19,6 +19,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/miltorrents.py b/plugin.video.alfa/channels/miltorrents.py index 2469fd31..a9b4840f 100755 --- a/plugin.video.alfa/channels/miltorrents.py +++ b/plugin.video.alfa/channels/miltorrents.py @@ -1555,3 +1555,28 @@ def busqueda(item): from channels import search return search.do_search(new_item, cat) + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = 'http://www.miltorrents.com' + + itemlist = peliculas(item) + if itemlist[-1].title == "[COLOR khaki]siguiente[/COLOR]": + itemlist.pop() + item.url = 'http://www.miltorrents.com/series' + itemlist.extend(peliculas(item)) + if itemlist[-1].title == "[COLOR khaki]siguiente[/COLOR]": + 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 diff --git a/plugin.video.alfa/channels/newpct1.json b/plugin.video.alfa/channels/newpct1.json index 2f20898b..26b6d67f 100755 --- a/plugin.video.alfa/channels/newpct1.json +++ b/plugin.video.alfa/channels/newpct1.json @@ -20,6 +20,14 @@ "default": false, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/newpct1.py b/plugin.video.alfa/channels/newpct1.py index ae393d51..22b39433 100644 --- a/plugin.video.alfa/channels/newpct1.py +++ b/plugin.video.alfa/channels/newpct1.py @@ -442,3 +442,29 @@ def search(item, texto): for line in sys.exc_info(): logger.error("%s" % line) return [] + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + item.extra = 'pelilist' + if categoria == 'torrent': + item.url = host+'peliculas/' + + itemlist = listado(item) + if itemlist[-1].title == ">> Página siguiente": + itemlist.pop() + item.url = host+'series/' + itemlist.extend(listado(item)) + if itemlist[-1].title == ">> Página siguiente": + 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 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"), diff --git a/plugin.video.alfa/channels/peliculasdk.json b/plugin.video.alfa/channels/peliculasdk.json index a5dbd252..2fed6d4d 100755 --- a/plugin.video.alfa/channels/peliculasdk.json +++ b/plugin.video.alfa/channels/peliculasdk.json @@ -18,6 +18,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/peliculasdk.py b/plugin.video.alfa/channels/peliculasdk.py index de32d30a..e9ae3d45 100644 --- a/plugin.video.alfa/channels/peliculasdk.py +++ b/plugin.video.alfa/channels/peliculasdk.py @@ -746,6 +746,28 @@ def info(item): infoplus.start(item_info, peliculas) +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'castellano': + item.url = host + "idioma/Espanol/" + 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 + def browser(url): import mechanize diff --git a/plugin.video.alfa/channels/peliculasnu.json b/plugin.video.alfa/channels/peliculasnu.json index 99cecf7c..ba170ee8 100755 --- a/plugin.video.alfa/channels/peliculasnu.json +++ b/plugin.video.alfa/channels/peliculasnu.json @@ -35,6 +35,22 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + }, { "id": "modo_grafico", "type": "bool", diff --git a/plugin.video.alfa/channels/peliculasnu.py b/plugin.video.alfa/channels/peliculasnu.py index 592862c6..10f9f5a6 100644 --- a/plugin.video.alfa/channels/peliculasnu.py +++ b/plugin.video.alfa/channels/peliculasnu.py @@ -80,6 +80,12 @@ def newest(categoria): item.url = host elif categoria == "terror": item.url = host+"terror/" + elif categoria == 'castellano': + item.url = host + "?s=Español" + elif categoria == 'latino': + item.url = host + "?s=Latino" + + item.from_newest = True item.action = "entradas" itemlist = entradas(item) diff --git a/plugin.video.alfa/channels/peliculasrey.json b/plugin.video.alfa/channels/peliculasrey.json index 6ef49029..91c439fd 100755 --- a/plugin.video.alfa/channels/peliculasrey.json +++ b/plugin.video.alfa/channels/peliculasrey.json @@ -9,5 +9,63 @@ "categories": [ "direct", "movie" - ] + ], + "settings":[ + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Películas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_documentales", + "type": "bool", + "label": "Incluir en Novedades - Documentales", + "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 + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + } +] } diff --git a/plugin.video.alfa/channels/peliculasrey.py b/plugin.video.alfa/channels/peliculasrey.py index ebd7c362..83116c4b 100755 --- a/plugin.video.alfa/channels/peliculasrey.py +++ b/plugin.video.alfa/channels/peliculasrey.py @@ -148,3 +148,41 @@ def findvideos(item): def play(item): item.thumbnail = item.contentThumbnail return [item] + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'peliculas': + item.url = host + + elif categoria == 'documentales': + item.url = host + "genero/documental/" + + elif categoria == 'infantiles': + item.url = host + "genero/animacion-e-infantil/" + + elif categoria == 'terror': + item.url = host + "genero/terror/" + + elif categoria == 'castellano': + item.url = host + "idioma/castellano/" + + elif categoria == 'latino': + item.url = host + "idioma/latino/" + + 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 + diff --git a/plugin.video.alfa/channels/peliscity.json b/plugin.video.alfa/channels/peliscity.json index f5cbe7f0..a9497196 100755 --- a/plugin.video.alfa/channels/peliscity.json +++ b/plugin.video.alfa/channels/peliscity.json @@ -10,5 +10,63 @@ "movie", "direct", "VOS" - ] + ], + "settings":[ + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Películas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_documentales", + "type": "bool", + "label": "Incluir en Novedades - Documentales", + "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 + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true + } +] } diff --git a/plugin.video.alfa/channels/peliscity.py b/plugin.video.alfa/channels/peliscity.py index d871a39a..89ba4cb5 100755 --- a/plugin.video.alfa/channels/peliscity.py +++ b/plugin.video.alfa/channels/peliscity.py @@ -164,3 +164,41 @@ def play(item): logger.info() item.thumbnail = item.extra return [item] + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'peliculas': + item.url = host + + elif categoria == 'documentales': + item.url = host + "/genero/documental/" + + elif categoria == 'infantiles': + item.url = host + "/genero/animacion/" + + elif categoria == 'terror': + item.url = host + "/genero/terror/" + + elif categoria == 'castellano': + item.url = host + "/idioma/espanol-castellano/" + + elif categoria == 'latino': + item.url = host + "/idioma/espanol-latino/" + + itemlist = agregadas(item) + + if itemlist[-1].action == "agregadas": + 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 + diff --git a/plugin.video.alfa/channels/pelismagnet.json b/plugin.video.alfa/channels/pelismagnet.json index 49076e01..03a2f6a1 100755 --- a/plugin.video.alfa/channels/pelismagnet.json +++ b/plugin.video.alfa/channels/pelismagnet.json @@ -28,6 +28,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/pelismagnet.py b/plugin.video.alfa/channels/pelismagnet.py index de3369f1..3a4348bf 100644 --- a/plugin.video.alfa/channels/pelismagnet.py +++ b/plugin.video.alfa/channels/pelismagnet.py @@ -334,3 +334,29 @@ def findvideos(item): servertools.get_servers_itemlist(itemlist) return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'torrent': + item.url = api + "?sort_by=''&page=0" + + itemlist = pelis(item) + if itemlist[-1].title == ">> Página siguiente": + itemlist.pop() + item.url = api_serie + "?sort_by=''&page=0" + itemlist.extend(series(item)) + if itemlist[-1].title == ">> Página siguiente": + 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 + diff --git a/plugin.video.alfa/channels/pelismundo.json b/plugin.video.alfa/channels/pelismundo.json index b3b5ae0a..ffe1237d 100644 --- a/plugin.video.alfa/channels/pelismundo.json +++ b/plugin.video.alfa/channels/pelismundo.json @@ -49,6 +49,22 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/pelismundo.py b/plugin.video.alfa/channels/pelismundo.py index a2af9cb7..a7a2ceb4 100644 --- a/plugin.video.alfa/channels/pelismundo.py +++ b/plugin.video.alfa/channels/pelismundo.py @@ -34,9 +34,14 @@ def newest(categoria): if categoria == 'peliculas': item.url = host elif categoria == 'infantiles': - item.url = host + 'genero/infantil/' + item.url = host + '/genero/infantil/' elif categoria == 'terror': - item.url = host + 'genero/terror/' + item.url = host + '/genero/terror/' + elif categoria == 'castellano': + item.url = host +'/lenguaje/castellano/' + elif categoria == 'latino': + item.url = host +'/lenguaje/latino/' + itemlist = peliculas(item) itemlist = peliculas(item) if "Pagina" in itemlist[-1].title: itemlist.pop() @@ -126,6 +131,7 @@ def filtro(item): for url, title in matches: if "eroticas" in title and config.get_setting("adult_mode") == 0: continue + logger.debug('la url: %s' %url) itemlist.append(item.clone(action = "peliculas", title = title.title(), url = url diff --git a/plugin.video.alfa/channels/pelisplanet.json b/plugin.video.alfa/channels/pelisplanet.json index cbc3db76..c9621d7a 100644 --- a/plugin.video.alfa/channels/pelisplanet.json +++ b/plugin.video.alfa/channels/pelisplanet.json @@ -61,6 +61,22 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/pelisplanet.py b/plugin.video.alfa/channels/pelisplanet.py index 935df8c8..0d76adc7 100644 --- a/plugin.video.alfa/channels/pelisplanet.py +++ b/plugin.video.alfa/channels/pelisplanet.py @@ -143,6 +143,11 @@ def newest(categoria): item.url = host + "genero/animacion-e-infantil/" elif categoria == 'terror': item.url = host + "genero/terror/" + elif categoria == 'castellano': + item.url = host + "idioma/castellano/" + + elif categoria == 'latino': + item.url = host + "idioma/latino/" else: return [] diff --git a/plugin.video.alfa/channels/tiotorrent.json b/plugin.video.alfa/channels/tiotorrent.json index 608e634d..9f449f6b 100644 --- a/plugin.video.alfa/channels/tiotorrent.json +++ b/plugin.video.alfa/channels/tiotorrent.json @@ -20,6 +20,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/tiotorrent.py b/plugin.video.alfa/channels/tiotorrent.py index 22048844..1e34cd37 100644 --- a/plugin.video.alfa/channels/tiotorrent.py +++ b/plugin.video.alfa/channels/tiotorrent.py @@ -270,10 +270,18 @@ def newest(category): logger.info() item = Item() try: - if category == 'peliculas': + if category in ['peliculas', 'torrent']: item.url = host + 'estrenos-de-cine' item.extra='movie' - itemlist = lista(item) + itemlist = lista(item) + if itemlist[-1].title == 'Siguiente >>>': + itemlist.pop() + if category == 'torrent': + + item.url = host+'series' + item.extra = 'serie' + itemlist.extend(lista(item)) + if itemlist[-1].title == 'Siguiente >>>': itemlist.pop() except: diff --git a/plugin.video.alfa/channels/torrentlocura.json b/plugin.video.alfa/channels/torrentlocura.json index a14b4d6a..185a1fb7 100755 --- a/plugin.video.alfa/channels/torrentlocura.json +++ b/plugin.video.alfa/channels/torrentlocura.json @@ -13,13 +13,21 @@ "tvshow" ], "settings": [ - { - "id": "include_in_global_search", - "type": "bool", - "label": "Incluir en busqueda global", - "default": true, - "enabled": true, - "visible": true - } + { + "id": "include_in_global_search", + "type": "bool", + "label": "Incluir en busqueda global", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true + } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/torrentlocura.py b/plugin.video.alfa/channels/torrentlocura.py index ba8ebbfd..e83bc956 100755 --- a/plugin.video.alfa/channels/torrentlocura.py +++ b/plugin.video.alfa/channels/torrentlocura.py @@ -464,3 +464,30 @@ def play(item): itemlist = [item] return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + item.pattern = 'pelilist' + if categoria == 'torrent': + item.url = host+'peliculas/' + + itemlist = listado(item) + if itemlist[-1].title == ">> Página siguiente": + itemlist.pop() + item.url = host+'series/' + itemlist.extend(listado(item)) + if itemlist[-1].title == ">> Página siguiente": + 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 + diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.json b/plugin.video.alfa/channels/verpeliculasnuevas.json index 428bd60f..a2bae6c3 100755 --- a/plugin.video.alfa/channels/verpeliculasnuevas.json +++ b/plugin.video.alfa/channels/verpeliculasnuevas.json @@ -35,7 +35,15 @@ { "id": "include_in_newest_peliculas", "type": "bool", - "label": "Incluir en Novedades - Peliculas", + "label": "Incluir en Novedades - Películas", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_documentales", + "type": "bool", + "label": "Incluir en Novedades - Documentales", "default": true, "enabled": true, "visible": true @@ -47,6 +55,30 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/verpeliculasnuevas.py b/plugin.video.alfa/channels/verpeliculasnuevas.py index 691c39b0..0702bb83 100755 --- a/plugin.video.alfa/channels/verpeliculasnuevas.py +++ b/plugin.video.alfa/channels/verpeliculasnuevas.py @@ -378,6 +378,19 @@ def newest(categoria): item.url = host elif categoria == 'infantiles': item.url = host + '/genero/infantil/' + + elif categoria == 'documentales': + item.url = host + '/genero/documental/' + + elif categoria == 'terror': + item.url = host + '/genero/terror/' + + elif categoria == 'castellano': + item.url = host + "/audio/castellano/" + + elif categoria == 'latino': + item.url = host + "/audio/latino/" + itemlist = lista(item) if itemlist[-1].title == 'Siguiente >>>': itemlist.pop() diff --git a/plugin.video.alfa/channels/verpelis.json b/plugin.video.alfa/channels/verpelis.json index 83033a2f..110e4f54 100644 --- a/plugin.video.alfa/channels/verpelis.json +++ b/plugin.video.alfa/channels/verpelis.json @@ -43,6 +43,22 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_castellano", + "type": "bool", + "label": "Incluir en Novedades - Castellano", + "default": true, + "enabled": true, + "visible": true + }, + { + "id": "include_in_newest_latino", + "type": "bool", + "label": "Incluir en Novedades - Latino", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/verpelis.py b/plugin.video.alfa/channels/verpelis.py index 5f9a2ac7..c2b5405b 100644 --- a/plugin.video.alfa/channels/verpelis.py +++ b/plugin.video.alfa/channels/verpelis.py @@ -208,6 +208,11 @@ def newest(categoria): item.url = host + '/ver/' elif categoria == 'terror': item.url = host + "/categoria/de-terror.htm" + elif categoria == 'castellano': + item.url = host + "/ver/espanol/" + + elif categoria == 'latino': + item.url = host + "/ver/latino/" else: return [] diff --git a/plugin.video.alfa/channels/zonatorrent.json b/plugin.video.alfa/channels/zonatorrent.json index add8e331..31f31200 100644 --- a/plugin.video.alfa/channels/zonatorrent.json +++ b/plugin.video.alfa/channels/zonatorrent.json @@ -51,6 +51,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_torrent", + "type": "bool", + "label": "Incluir en Novedades - Torrent", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/zonatorrent.py b/plugin.video.alfa/channels/zonatorrent.py index 9835fee9..d3a85b28 100644 --- a/plugin.video.alfa/channels/zonatorrent.py +++ b/plugin.video.alfa/channels/zonatorrent.py @@ -178,6 +178,8 @@ def newest(categoria): item.url = HOST + "/animacion" elif categoria == 'terror': item.url = HOST + "/terror/" + elif categoria == 'torrent': + item.url = HOST + "/?s=torrent" else: return [] From 93ab41c2dacec99c0b778d2a0d6dbc1603df6a94 Mon Sep 17 00:00:00 2001 From: Alfa-beto <30815244+Alfa-beto@users.noreply.github.com> Date: Fri, 17 Nov 2017 18:22:32 -0300 Subject: [PATCH 2/3] asignado iconos en news --- plugin.video.alfa/channels/news.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin.video.alfa/channels/news.py b/plugin.video.alfa/channels/news.py index 5a9b7ea3..b2d48c92 100644 --- a/plugin.video.alfa/channels/news.py +++ b/plugin.video.alfa/channels/news.py @@ -75,21 +75,21 @@ def mainlist(item): itemlist.append(new_item) # if list_canales['Castellano']: - thumbnail = get_thumb("channels_documentary.png") + thumbnail = get_thumb("channels_spanish.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") + thumbnail = get_thumb("channels_latino.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") + thumbnail = get_thumb("channels_torrent.png") new_item = Item(channel=item.channel, action="novedades", extra="torrent", title="Torrent", thumbnail=thumbnail) set_category_context(new_item) itemlist.append(new_item) From 3c2902d5eace70dc24da7eda3ba4392a371b0b95 Mon Sep 17 00:00:00 2001 From: Alfa-beto <30815244+Alfa-beto@users.noreply.github.com> Date: Fri, 17 Nov 2017 18:30:38 -0300 Subject: [PATCH 3/3] agregado icono para idioma castellano --- .../themes/default/thumb_channels_spanish.png | Bin 0 -> 15520 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 plugin.video.alfa/resources/media/themes/default/thumb_channels_spanish.png diff --git a/plugin.video.alfa/resources/media/themes/default/thumb_channels_spanish.png b/plugin.video.alfa/resources/media/themes/default/thumb_channels_spanish.png new file mode 100644 index 0000000000000000000000000000000000000000..99c60bad027437a3f033dea6115c3cb3009268da GIT binary patch literal 15520 zcmb_@by$>9)AzlUAfa?igVNn4NP{Ryx0Fi9(hG}}AT24NG}0ltq#z+6y>to)yOeap zd-FW+_y7CH$0Zlu=bSk;Gru!)W=`ab=PHEvY3>66K&YnrOa}lU%Xh!HIA95EqAeNx zgXN*1_6isL3Ba}a0Dj}Ssv3EK?WgX3AqtN(e856#PbEW7T^Bn~Z!33Oz}wrK_pP&o zhqaZfEw78aea5ad4FE6#YR{g&^2yv;@J=#=w%+X9?~M;1nUDD^kT6cXz{F`GdxH0; z+nt>J*^3SabY1Qb3_ol#a&p=aWG{bWp@JVi#0Xtf@XN3fY#m0epQ&dcG=_Gblp%1C}mcUwUMTahpKC(8ei-8{X=&nTAI9|uoQQ)=SvljZ*S zG(Fx8xZrAU+EXfZ_?^^pf0>p~Cg{1r%gx;Kf@_ZQ3Y5e4vC;>9psKniTS}m!w6?W+ z=~P{-a--r0BFvk|Fgp|pEeI*c^!b62{$g~bc3RhK-~er@c~ z-7g?>V-d!+ciWoPHJt(p=t>>RYOZ5FYZX)WWEj^WaWyh~05D$CTwIN&|4trIK02>F zN4xC$kD>jDlFBj8Zrh~yu8<-yIV0H;sPt+*0H_Im3MX=|c$YO}x*y{*e^uFTXg2&} zh8bSje2_V?Sg~`xxD`VWRWo@-0918O)E~4NX(h{@4OQ;8|3Dj`a1^a>7itX4UH!hO zXqS^Kgtj2-0APD{q#RlPT{PwQEt-LX=Q|>$_17<;Z5`kKTr8=3*XQ*?y+=re;qysc zpwDSBO_8I*$>*KpC$|%FZ`pZ!s0>4r$I8j4feo`3&)0{Q4M~KE@(OIgGAPeKs>@?? z((EF}f)9a28+)Y)L0T+>2S=7sr?QgJt(I?H_22s;fJ9#czp(f5ha&Z_53*`3QDbSy zV^s-~4zYl@i)#ido;MqHJr%~K4iI3i(#WLLByQR?pfkBax~d0l%>7{b_VS?Rkm1X$ zr?1fxkaPNpYpC_AEuHpuqAMi4V~-v@8keu!%up(@=~_w;xc@P1@zfMuWzO$TtuI@{yD{;vb`{(W{5PalK;C!xS&nk2Ea|Hj7eO1 z8RqI7f4m>uu+RuX3GNdv%#gVvxr5uajRf3R3S;?=7 zm*Lb~?-vaPT^UyJfvVE-b%^&k?m|}ar9CU$rP1?dyMQ!9`}faQ2+)_p!6Ek5ZJcsQ zPL}j^NEK+8&E2wiY9LM8fCDf(C=4~4(<9xq*>|%}fSbEX*-Z)oj211zC9V4iuA!UP zh`o#xAn<$J)~x3eDFAS_nk{)~A@|dDHL~XfF#l%B=}trysFcB4*b4~Y(+~blug_fg>oHTer>|os-Q7bn6sslV|w2mlp zmjSya|Mye3zat5wahOzX!1yuPsBnt(b4vg56Kq%Qmp;!pr!WCagN2*TzE>66P6X5B zr~gams`MW^@y#eH-KIwX(0pHF^$EQ~k`54&g~bnK^M{#5CJFL)^KL$NfI|T6C(E&t zI!&@j-Zw1CTM$sBvbj=pa0*nfFT^f0Xi_io&X9) zkiH6l5CCv&TuT7pmIuH&K`^NPe>bK4*8e4qy`0d{3OV*g<8u1bV_dkrIG2-d#c8Ig~4U7KD&afFc`qxyXZ!WDnwB&@w`nRbR z@$61~E4Ny3d)oR)ynHsw9m2Rr+~MmykrF=?_)W35b%aakCh${z^L+7;dTRd8NAUT}@k0UmioG&ZEFKTcemSt8i9n(9 zcLR;`o&HkYzEO(x(XnVNP+LOS*QG~=V^_va((9Io>!~uv-HH;_Yg)lEZ0~;61Cqx z_AfkAz4oB#@#Hi3Oie88e-vZunhg9W${^WAw9#oMGqnO4gj`{9&tp zYNF`y5bu=C1`?gyF1+V`i)tf@xKPhT^Fd3R2aDTuiolP=#1fa7Z#g2lh{-C^xC2x; zmonGpf`?@)!B6OgHT~zN*DvtfM4r3dbI1h@LxB3=)zst7ac>vhw?P577LGzMi>g6i^?M&Ysf~w5v^>~qWp?Wih@`34Euhs;P@| zUQB=p7m|ssrs#J*LQ*===RmpGq}6756H|%VXAupt|8>x%0YxYBf>kD<5?`NdaMjf< zmJ?dTjO8X9uD`AZL^Y@cc%{VoCLBONDAesanaW#;09-&Qe>L|dV@GKu*g z<|ev|^xv)+iTImMVgdTgF-dH05jm8xkLwW8?^k14J%>VeF3!dDxAJd2=iH|Rfb&Rb zhmro=qtTVhldY<$OA*+5_MrGJrQLYAfb7Ceq+hF0!JAtP0^st8GM%X2EW=ce%MsY{ z0@{~xEhU;N|F_lsO{DX+O~~v_DUJMnP`{UBS&!P=r^~3hPFk~A#yHTT$9v-?wVQ)9 zC&f7Y+{IY@E?IQMZW(@FUg=0%GBN|!obyu`28J)q6JLsSAXR)A;t?&gSo*~y&BYsxO4y#zk$0< z_x*}Lh12Mls(NqRNGWZ5oigRpWZA)D>z*PZP|OJT7}SVJNzL-C#B;rD`6H2kCqGQd*w3RSNyl3(fxNJIfc0vorbF$>l1hKdf) zESj3s5|e}p3D2~!uZX~Zgk%!Jn_?noyY0=nYFb95Bh!WP(LYDpi$K&t{TMGrns*bY z$jgFQ)Ax;s>9_f!1C*MInI+-XFL_foOq7ge7r6$yCCuq!VM8VVxD9Z}|5WAP*SqIr zD}<|>_*Z%^k9ZIhIG}-KvanY?csIFqt)Ci9XT_R$vDqnFIsn8!1%d9YuWLu}&Gl=J z?-tw0!G;-Hx;_K2*ymsEyZW4;ywUkb6rAp!!rZ~MrMF!yX`L)wk zC-bw|Z%gu)p?ZiUenJp2N6UJE@UcF%Kq>v~qar)W3I zEcG${t!dm}nGs&KgD?_FJKxG47lL=ld}h&OK=5%gP>3%X!AgMIJ9Ge5Rl;$;Cp+*g z@AzWSY|hIu&S;i$yl8K>es1c~iE(@2NtTG@YW4HU6ikT^&<=^eAw0CpA%i|TMRJqH zGXwt6UTi|iKgqJmCwsop)0FBUPC1R^4SQ`FSkM*x#X%GVn?A)C@AXWTkcfsT>Wq?( zueUpl2`Emt*v=QmSG3w?#lnJP%;Bb>l&7VQkH`~Sd#TE~JkH??oXh{{;;^{&^dV3a z0SrBrv5h8R^thAV_YPB~g(1HJ;mM%j3*}01Q0O$ttHosd9yBT8aNSo`l%rpqPAM{;LcCzp~kEkN+uE|lF?i< zvXnnmSw)<6Rmb%S(b>tMh_h$s{%EX6`X3GO#ZH7*%YH1qxBaBxyk5vTLn)FI& z;86&arY@P(CElNzS8*VYTX$66RCkhK*U;nYsX$Rq`*7trW|0Bck8K!Pb^~vK!?fIa zEu7~7w2AO6*0{Zei@{T2`*bU_I$w7Gl!E?h5`J@*u3R_K^!){WJOfonb;o>xndJV= zb^AQfoL2o>UM$d~uFc)!6HUYZ4-%^T7~%tW2epv*ZkrRMrMI2?C2^EkfPMLM|CVuZ z^DB2lI(V@4QZS!NyQ>%cxtvkM@9+ZEN@$_*iuBr_V8xz&{JyetBtnZP zUH2`N8t(M4Lt^MC?LhnAfa@+zr$!O~09jMP+t7%GDmbP*Fb7A$Z!*3S^+4wl@V~q$9T=ZRe0;{$kI=u@&1Uw} zlf@j`Wh1#l4ijcW4mi`KfkN(?=}EG;sdiacucmk%!h=o!;&FJ+{&}8t<=OB^u1V)s zw$)h1w#6BqC85*Q_+NCv^iL4ZZy@4KN(TMe#0e1Rgb*kKgnCN#jC?qL|-X_X=fc#(4 z1P;KR+V2*MRi)L$f=4bEv2G&r?chgfKZcvuTfD8ck93wAb4|Fo)`XYa(h-5Dq=Fd#5 zxba9>XSJE-LQkcXz|M$81HonL=i#2%f`R*x*L@GVf*D zKKE7e_dXX#+NNEg_qVk5Rbk`@X||h zaF1s+ZDhN4-zzwG(Vp;=le6q|@_cH2&!9l#3-Om|S?hAtWYO#v^gvE|GcrOt%1u~c zZ15%PwfLwFlv-XH^d$Psc7}X#HOAPxiif?CTW3lvM}KvX)L2>z8OSH+o!OZggQ~?$ zzqn5|vZ<|TS#7lLOl|>c^U%Pd6mATUB-utu1u`?YDFq zgVArT5tXdJ$1Hok1nD&z-Sp(&2)=6tNvZvb?mvK-0@8$!njG+~)+*K5(y8A)QD^m> zh=#NNno66nP^lRAQJ{LO08rv;=c!b@V^?RALr(4aPl;Lt_|W>Bjv$$)E-%OXmeMBZ z>$WDSUK`#kW`W~>@Xk+tsBC^9#tOBuxaAG9V=p*2%R-1%84qh4=g>-tJ^BYz;qZ1b zN{!Y+?~yy`ky?#0=_mq}RC~CUrsSdg2hmR!q`kf?W3zk~d^o`;DTY2TX@LHYoD*LE z_Cd4V6P*cJ7;RUM#hm_I(^I{X0-XsBrO>OGWV%kL^;fd8Xdby2owCZ2M=iavtgz0V)|c)TZV5l2Tsh7wW@{&Gi~R z?9jPr!V6D(|JfVb7lydY3O1^3qp}KAzP)Bmu?Vg4SZhMhR;SCw5 z)|O1L>Bi&4isFUNH2#y1KzP2lqEDtaQIMZvW49}3)1EK4{9^Iv%n@7qxiZiUiUoRz z!n@*K-fI`i!Q?0+^Tqk7uu+{TGtSt36sf-oU`+{D2fddoXQJEHcw50>sqtkt-;S{6 z<-HS-)|nuJ>DH%R)5R}P`aLG-+Xg&@M9TV@1>`9!YXabm7ccaZKZ%xqeH45bew()o@w^LD~>tB~s zS7?k44#ModK9c#K{tp`t%f^mo5|Ft&xaLecM`ap9VZTD1o!%g~n-a*xB(M*<)`#?A zh$8FCpmtI8sJ4T$O*Qix2?mv-onL)JD5e9ZdXE?3%7EFz#h>bHPMYo$xeotAdiuqU zrD1(}sJ0SR4>`R}7MiI*DNOVM1#6I+t!|C2@-Y%$|VRX5If_V6l$yeSZiSVAV@V3lty8UyY?p zLVZWjFa{Aii+B!vrdcpHEA4sl>{e>JjP${y_|iYum2Y8lIUg}sYkzFekIA&pwCSm& z61`Ds*B%%o;o;#M&u-Ga0xcKaT~Jd&Jpz_A6d=KkM-g&is^Q?mJY z&~(UnEh7+CAL=<9<#b`-{*EbDWC!cVjy zK!>aNIl$C$I#mUcPy2{#iMUPbCiCGCE(VqVQP`N*^&3^;DX^=ZWFf-11Icb zBrhA&A3i4s^{wQa?G7Kj^YEX9P1v->*S5}z7<^tBacb|5+E0}ls9({{J#j9}E0TOlx3Ebc_Vu$`40m-_F z!5UR!CTU?Tey^7nB3CiY&8u(^RVz84P@$9~`PBFEJ%dLBK+ z-J^v>n~B4)_+Q{Yf`M*&9yxUo5mSpd*vm@ae1sJs@p{!gf_JBUVD=DqMTP}l9m0|j z|Lcjhy!n=i%bUd#Wwx668717kJFG%hQ}r@Je7Pq%%o@w|7s5p<0~LG>z^=YU_muNO zf<2|ooe&zY%HaXu528|_W>W^9%7+Q%_F5&ue(J`R((`~=R! z-go96O;w(aCVI*7%^^k6;;!db6Wl<9B=Fcscm^&1%$Qk6;Xs(e9GA2sp7pxc`jg$4 zSJMkm;q&Y>?5wRQ9vq05pJ8`*v|;PB9@M=P ztpjYU2=c;Qw33mwHfA}Y{18({y2#KQV)Ih9UX_E_Ex3=dD&=;@gg6IDb?!5TQlE1@ zbQ^!AXqNO3+mV?#zHKteB*Wguq|IgWDL@%do>9JlNzpOFV}wQ;kAo&(%D~1$b~t`t z-o861jQm)m&Zvy6u!V~SqqcBxEO`pOSC3`iK*@oV4F+wB;x1Q1Gv(*Mdhcjdr-hNV zv$jxb;Do6PIU*9Q4&I@uol|rUzUSqSJ4r&5K#k3C;HRwh44@Ujx}X`KtR_eIC{c$Mow>1jhi>za{D4;8QOmkUR3_ zF3_!ik)Dc}{+~2e2T~iMY8qL7hWv@++ce-@AcCL9jv~*6k{MJRI`kFg42>(=*)+;| zu@!CpvnwM_3t0z4Yg7u$A&G9NnO+%0ZMpt6H+BtubJ*SdWdEXS5Lk>GM=rugzwJwp zENebgo6~;Ry%U{65X2`?o^qH{{;*;VhB=)|e(P4>AG}P1+9ttGRn2;_uS-h-ca>Tb zL}PKvzu!V$)Afm88!0HKu3I+3%~|Qtbf(`IAJ$JofhXV6N+a^E0NQn zZBXwrUUq{iH`bS|x_MhC=J4~#5Qh_U`w7Ut(|ZzUj9=H?aSyA9mCc_#nLI{nA-+}X z?msQIFD=%hcW$NP9aB^yH{Ltl_0sYcE*$VTIZ9A#Jzy9dw70ZxkTy}6@__Uq1*|Zp zm2tFm#VU)DQ?w@Qj}uGSIbMlKRQI!^+-g0wa51-QkWF$AJw+XYpyT8A6{-|kd6#f{u36!lWEm(tl((7w|1IV=Y6sIobRqJzu<0;Ve<4(e78dQR}<9>z~{h(>)m1g;C@nEHG{;Nfx-s=oAF8&)^U> z*9eB5Q@ydie%c1>cyaZ2U#FAO-&W6C*u|B0i%_bJ7t-fj?(+FUskRd>7{6ME3+`JF zA}^W|xJ=YkT?))9XBQBj0R?ip$B(oY9t`u{d6N3&MFMEoDA!PTV)4UU$hJPU)f7yk z1uYe4?pt9{$(tiwBEM>h@;lCey-~?8Qcv4#Hape^li5mwA^`Yqgxju1<$F#LRGG0W zrU5wd2BO^Fo0C2u{xZhdaNdc@N1A}2_q!;t)Oi1<3+#O0>0ClZQS(ap*uq7m$n7wena-4 zHWt*kp+~N?V!*3RjD!lX@~~r_ZB@7`z2Xg7;Z02V-*&y>GJ6|6Ne}{uFhdH9_nc{p zZ3fZm@a-s1Rm!WP=jD!#5d0SJq!m}tsr(ZeB`8xDE#vZ1{0{_Gqf&A#`l-TF7t8fg zQ%OKHV(NfL=|-a`pMi&SYL%`Qpj~y!QpqhWu55_WVZPi@$22-lRq95FnA?F)sycXc zzWSV<8eiGma#qsU8X#LGR6kGLP?5@TSZ7K0&{8UNzPjqc~4Xd>Z$1ZjPOviDx62` z4zPp>Tua*K0`FELiEt5>K8s8;$bsU5F3nx8(1}5xoQsQP7a^G_7;p4L z(1S);{sO7lV1Tj}3*5=lLyiY~E!F0gF%?%e2ueCwRfH{c*17i&GBfEIFO4saV zgz;k=e*~h$5(hA4v#G0T7`A3O#ellGg%HgZ4hpEtJl@t101LhNnL-mZe^u zw;+>7WIOG4Co(^=f|7SY_zSepaLOt$s^}n&9^v2Cj&doq@E*w>13hlRL~Os zA`QHo`j!~n*drYFYKHU^OPfOnjT$Nsf6jB=B?H%DdUhovjWDLOTV z#`R+5w)osi8h+;7=oCeV3PX>VWp{z;E@ImEem?9)%sKqT9TJ>bK!0V+Uhg!p`_x zf9C2z^CVtxFkCqYl#)=sq!ELlI-?s#TB*D$y1FmN9gj7^fJ!5{FyZ(6W@Opni)pf# znhl!lM|q$bE@64{u~qV5T^8Io?!(d43(w!3qT~@Mh{6gZoaZk-+YzeS1XRPSd8>@~ z7v~Fe!i7TbK%@Y5g5na4rJaiuvk%WdUsr-w&+ zmi}5-{m5LRlPKjICOD7lpYJk)R2SGMkGF+AZ*$l#E)#6;`)uYbf>Bl;*DDV&ybP>m zhBEPF8RwhCRlYDt=mM{mqgmkJ9mf!G8slkqlIfY!yw;1=$mCf=aC9<82i#?DsX(JR zBxsyidlYE2OV_FI3HyL^?2`lo0I`9QGG8HTe(vuQ0%aQ1nJ7uiUZkb1#M{!U_=7$~ z)vF1s%~KCf==EDda;>XirbeZ7Q4Qn*ek%@?LHynF{j&mLBZRMCpJsL`O??|KDT0*;&a zHYU(o#%*_#(E^qkjXR{rB~Ec~ z{u6Y>*nVwYr=hLQJ2n^dsC8WRREYmoE!>IuEzQMws`A_4SjJR+Joxs>=r4KwN0X|R ze_CF`nO3K|m6@G&#mr@uck~?p1kYC&&pJWz;5;C}j+^aHXtzn~hbR$&tV-g~|GkaI zA;5h03p41ivGkxyM$1UZQ^1c}<%|rR&=zvE_qyZ7nD85P( z2oeYLe?p=rOowp%*A2?C1j&~KkD#@EIkC45(k?6d! z?CdPD^agS7&Ytt* z`*&+S5&WqrGnntWX=nUH9x;N!3+$>Y*vn1id}lycA;{J~gfhuUjaIflGO0KrDJm3; zfcE{(jx}eP*sRzzugs{E$S*1)v#r))3<5XV`7V8BerN90IB_*d3(pGicIdv;h%%?& zL4r7d*g3lo0@7VnD#DQn{UPS*dG0TI3$c$B{PCjTtU32$P@hg~H^Ed2{nYn#55)*& zM7k@R<9KyF&fBIA>XRgn{|&yDk^XMDYv``B<#Te8tqfH{PLnR|$pG67kjw}$*Q&y# z>N)v>|DO6Ys}C9BDVkhkOR=1~8Z*JS2$jqp-tyH1vzJQrbP9y|m>_|Ixo*&fXI`7v zID4r^u+kq;n+nNME-Iq@?n^A1o~uE6|rDFk|) zXH!OX_s`DsH}cHC7VmvE>Ae|*6YlHt0x&ir86V?1(0c#P{9I8^yjlPEx@IHB_6LCX zVTOt?D4B0T9sBylygZo@ylaB+g9jRfs!pU#2dHNfA=xUl&a#OIjslS{M$?H_&RSH5* zB$)3rPd1j6QZ-+_cH{EeLrqOA%eWx>BlR$R0hA8zC&g|i(`dnP9yI^a+0$-6-!cQ* zl7)9X9_SF_=73CXZ+bI!Z|>saxlTzR4b=$YFyR6=W)B1=(YOk@r#wO-me^Aa0U!+<`(&n`wR;hlGYM`_KRuzgwc)sv3 z6lw@xkDil?m-a$Br)Ts{io`Y6_Jk6cXAX(cI~yPm)GA=4F}#RPc9@qvqH9KSQ4zOJqN2m&vZC zZyxI0-IuEUSEVE4<64d3?0|Sh8t!>GuYP={1-lAcgatayCrL&%+?Grn+qQ3AG%%FB zE>&ZEK-__CIhrnl*sL!HlQ^iGZV%jKuXn!HnBA03*}oet)8YB7SE5!<3_II_(ASFO ztJtS(CQx@rt##mOsi}F>=~fKAj^H(1ESe;VFdoQ!_XJu}K2e-fvva%s*o)IyJvQ_x zVe0ZoZuq#LQljdXuQ`g&ujogfH;s&>8#0@{K{?!W!GrYrVwhEQ9yoZZ?(*X5|6{^A$t9KyvjqkU}<~S!+|p2U8aU()8oy| zw!0Jc%IE|V;@ef+5Z?7%aY>@``A$I?GJ(Vs%%vJTvCJAH(MR3$qdTI5e zfr(b%5L|WiHG%sp?^;C>uJ(WHlbVkZF)`5Fz2K2}KI?VZ z%qwec&EycbR*^p)CS`euT*SpqJ-x%Hujy-3+QZ*oc3xPy1D6Tvl%6XD^H!7~)|j2v zRimXkc2`5IVSKMUy$yb^4_Sp(vWn;-JdwS$N9Z?|`cwXQm`2(r56Q+hT?VsgH_^9q zk53=k9rtJ{%1M>0-=>=;h4tT$V`1{m#lyb;MuFDSyB03s=)it)+`1QQU|-KC z<^s&53w6Qi)*=S`T4|u46`w6FZ5MmGby9;|$?l!--k3ru)hl4#ow7`7XijhRXP3CC z@87*;Hd~wfa$EvxW7qkCcsuYG`a>hZ^+jR=V(Uthjj$Mmt6Q0NbJ}+&?fE!>tL1%% zd)V6sWAVFk-<5yYJ!&P<_?9a30m8`g24Wp&E?M&`0o8pK3do25^XoR3(8xN7Io{XB z0H`}k$uHNqq5Wd94{_k0t94P=?kNvDfq3T@9Rb!*Frk#PQkQ_5i2y)#m6F~2Y4j&4 z=)FaF$T$YTNPZWX%IjlV@?ik$pD@A&xbFzUfu1VjPJllEi(f|p7qjEv!w%KE4(@>g z8)L9*S4&*W{FpnsX9`q6_Lz=lNE&JlM$2TM=F0cBKLG6&&*4BMd4dE59WtJkm~pF%nRwxGR(e z3zfimcwzC^+%1v}b2?!eJ8Fd~6f&KqSlrsKbKlZpB0&>{di`GT!PLEP z88nfsy6)F;m!@(saKul8(P7?#XRl73HfAzR>+w^k=}|oExKqE_4;5U@DsqD{V(s;d z2@G*{fJFw^3h-K0%TEb@;`LMt2h1s-p7CdLY@{Z|iNCzUvwxhtrF(xlD%;)xOi5?3 zK{RL&=CTnmP9^uY%z=631r4TZBdwgtTfs6pQZ#V-r0)4rU9ecp^yT!v4oKp!h>O_= zRl+;$1{2v)JNk5o+*<2?mKK_)%^FE9q5Saq)sGhxMeZV5z=XVM!YHM-A za}IuX0>*}%NJ&xJN>EpT!zC%eUvQ<0XEnRtLhpi!vfO9U{&Y>Z2Y7YyvJ|x zmx*CF4uh;k(~Oq{5!J9cb>mJzurFSibNMz-CRcT70q24CzDu7>dc!9OR~y zucYJ0sAs@DY9UM!o(ESq1t6sJm1~8+by_!|{^hwyOocc#?u=zdYiU*vssv1=Cewz6DP+9i@E+qH}WcJ=~J4cN@4ySqc!mKs83S2>q8%ze(3U9xDOX42F1oGVLWu_~eHj3^t zvh?=gAHq?Z&p}9sqP@`%xo#c1fI!r5Y^R0LDHHLt8Z>D{zEFtdx9*f@@?g`-8Wp;s zomy%-dobf?r(YDx8@Qik&?fFy-&9j?PsBmV%<-^O{)Z52){M-_l-NSsTJubR^W>C` z^!ZguL8_*BjTKaDi8z$s9fOI0j9WK+X!DW(V1o~Pwyh#C-mq4(-}i{It9 z7w#&U_=@=%F6Q~*S6BAoP3qg2jGK#}7^Uy3JWaAWQY!t9`>T7~+R9naMxSaY@qD+G zQFKp{NXF&BwPMuP>uuQ|m+A?U&LFKgVdXIXA{KP={v}_GgW1WS&65QEDGb%bM4dMt zs-wH#kja2*Uda38tlsd_xTcHxZili8HVzEKL<;VBY8vV5MU^7wEK2Cefjp6_dQM?{ zu30F*r8g0^WVOqhuCjK z?h3abxGLIV`#kznHQzJwE!7bJ@13BbpzmB0#DJT_;Ta?cY@P`2(Du#6I%%hE5pUz+ zifrlDd3GjI18tknVwpFM-!3drbIYgH;c2jjdJYehk`$g*2T>t5SF_!*-f;WwZnw6P z*}&qOC(yoOpE`8=Gb+5|E2wwYtQp=N|0Mu7$Uy6U@+tkSf%oyTx6Fw~slyC|N%zcg z>hFy9nu+gu-;Np&%jx0E9^T-sJ*yTy#mv^gCaI;5KK2J$2i<9+u8 zkFL2M;jO9i@`Jpxa#%w+`P(?~(jdMeYPDkRo2r^OtakJFZ2T$j?ON|`8rPPOZn6R7 z>Zw@3ev1*4_I5s8%FE}glwjQ)13k5?%14FRMxpH}Da_q8>k)DhDs5%XH+Y!$hT_*W z#6Pu#3azM1{`nHhva2l~vM#V!Uz6q!eL1*a!-q1yT5W!0<_sG`t?1