diff --git a/plugin.video.alfa/channels/allcalidad.json b/plugin.video.alfa/channels/allcalidad.json index 324278a5..18c7397d 100755 --- a/plugin.video.alfa/channels/allcalidad.json +++ b/plugin.video.alfa/channels/allcalidad.json @@ -18,6 +18,14 @@ "direct" ], "settings": [ + { + "id": "modo_grafico", + "type": "bool", + "label": "Buscar información extra", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_global_search", "type": "bool", @@ -41,6 +49,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/allcalidad.py b/plugin.video.alfa/channels/allcalidad.py index ede804b0..96d115d9 100755 --- a/plugin.video.alfa/channels/allcalidad.py +++ b/plugin.video.alfa/channels/allcalidad.py @@ -3,11 +3,20 @@ from core import httptools from core import scrapertools from core import servertools +from core import tmdb from core.item import Item from platformcode import config, logger +__channel__='allcalidad' + host = "http://allcalidad.com/" +try: + __modo_grafico__ = config.get_setting('modo_grafico', __channel__) +except: + __modo_grafico__ = True + + def mainlist(item): logger.info() itemlist = [] @@ -28,6 +37,8 @@ def newest(categoria): item.url = host elif categoria == 'infantiles': item.url = host + 'category/animacion/' + elif categoria == 'terror': + item.url = host + 'category/torror/' itemlist = peliculas(item) if "Pagina" in itemlist[-1].title: itemlist.pop() @@ -98,6 +109,7 @@ def peliculas(item): new_item.infoLabels['year'] = int(year) itemlist.append(new_item) url_pagina = scrapertools.find_single_match(data, 'next" href="([^"]+)') + tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) 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)) diff --git a/plugin.video.alfa/channels/cineasiaenlinea.json b/plugin.video.alfa/channels/cineasiaenlinea.json index 2ef9c1a6..b42bf5d5 100755 --- a/plugin.video.alfa/channels/cineasiaenlinea.json +++ b/plugin.video.alfa/channels/cineasiaenlinea.json @@ -26,6 +26,14 @@ "vos" ], "settings": [ + { + "id": "modo_grafico", + "type": "bool", + "label": "Buscar información extra", + "default": true, + "enabled": true, + "visible": true + }, { "id": "include_in_global_search", "type": "bool", @@ -42,6 +50,14 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true + }, { "id": "perfil", "type": "list", diff --git a/plugin.video.alfa/channels/cineasiaenlinea.py b/plugin.video.alfa/channels/cineasiaenlinea.py index 17a25c83..cefff938 100755 --- a/plugin.video.alfa/channels/cineasiaenlinea.py +++ b/plugin.video.alfa/channels/cineasiaenlinea.py @@ -5,10 +5,18 @@ import re from core import httptools from core import scrapertools from core import servertools +from core import tmdb from core.item import Item from platformcode import config, logger host = "http://www.cineasiaenlinea.com/" +__channel__='cineasiaenlinea' + +try: + __modo_grafico__ = config.get_setting('modo_grafico', __channel__) +except: + __modo_grafico__ = True + # Configuracion del canal __perfil__ = int(config.get_setting('perfil', 'cineasiaenlinea')) @@ -75,11 +83,13 @@ def newest(categoria): try: if categoria == 'peliculas': item.url = host + "archivos/peliculas" - item.action = "peliculas" - itemlist = peliculas(item) + elif categoria == 'terror': + item.url = host + "genero/terror" + item.action = "peliculas" + itemlist = peliculas(item) - if itemlist[-1].action == "peliculas": - itemlist.pop() + if itemlist[-1].action == "peliculas": + itemlist.pop() # Se captura la excepción, para no interrumpir al canal novedades si un canal falla except: @@ -110,6 +120,7 @@ def peliculas(item): thumbnail=scrapedthumbnail, infoLabels=infolab, contentTitle=title, contentType="movie", quality=calidad)) + tmdb.set_infoLabels_itemlist(itemlist, __modo_grafico__) next_page = scrapertools.find_single_match(data, '>>': itemlist.pop() diff --git a/plugin.video.alfa/channels/maxipelis.json b/plugin.video.alfa/channels/maxipelis.json index 98a27139..3231c6d0 100644 --- a/plugin.video.alfa/channels/maxipelis.json +++ b/plugin.video.alfa/channels/maxipelis.json @@ -14,8 +14,7 @@ } ], "categories": [ - "movie", - "adult" + "movie" ], "settings": [ { diff --git a/plugin.video.alfa/channels/pedropolis.json b/plugin.video.alfa/channels/pedropolis.json index f52134d9..6852cc86 100644 --- a/plugin.video.alfa/channels/pedropolis.json +++ b/plugin.video.alfa/channels/pedropolis.json @@ -67,6 +67,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/pedropolis.py b/plugin.video.alfa/channels/pedropolis.py index 3bfec694..6baa5edc 100644 --- a/plugin.video.alfa/channels/pedropolis.py +++ b/plugin.video.alfa/channels/pedropolis.py @@ -222,6 +222,8 @@ def newest(categoria): item.url = host + 'movies/' elif categoria == 'infantiles': item.url = host + "genre/animacion/" + elif categoria == 'terror': + item.url = host + "genre/terror/" else: return [] diff --git a/plugin.video.alfa/channels/peliculasnu.json b/plugin.video.alfa/channels/peliculasnu.json index 38e44252..3a72a2c4 100755 --- a/plugin.video.alfa/channels/peliculasnu.json +++ b/plugin.video.alfa/channels/peliculasnu.json @@ -46,6 +46,14 @@ "enabled": true, "visible": true }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "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 8d8a5a5e..592862c6 100644 --- a/plugin.video.alfa/channels/peliculasnu.py +++ b/plugin.video.alfa/channels/peliculasnu.py @@ -78,12 +78,14 @@ def newest(categoria): try: if categoria == "peliculas": item.url = host - item.from_newest = True - item.action = "entradas" - itemlist = entradas(item) + elif categoria == "terror": + item.url = host+"terror/" + item.from_newest = True + item.action = "entradas" + itemlist = entradas(item) - if itemlist[-1].action == "entradas": - itemlist.pop() + if itemlist[-1].action == "entradas": + 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/pelisfox.json b/plugin.video.alfa/channels/pelisfox.json index 3f94badb..ba226d07 100755 --- a/plugin.video.alfa/channels/pelisfox.json +++ b/plugin.video.alfa/channels/pelisfox.json @@ -49,6 +49,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/pelisfox.py b/plugin.video.alfa/channels/pelisfox.py index fea2249c..fc499fe2 100644 --- a/plugin.video.alfa/channels/pelisfox.py +++ b/plugin.video.alfa/channels/pelisfox.py @@ -293,11 +293,12 @@ def newest(categoria): try: if categoria == 'peliculas': item.url = host + '/estrenos/' - item.extra = 'peliculas' elif categoria == 'infantiles': - item.url = host + 'http://pelisfox.tv/peliculas/animacion/' - item.extra = 'peliculas' - itemlist = todas(item) + item.url = host + '/peliculas/animacion/' + elif categoria == 'terror': + item.url = host + '/peliculas/terror/' + item.extra = 'peliculas' + itemlist = lista(item) if itemlist[-1].title == 'Siguiente >>>': itemlist.pop() except: diff --git a/plugin.video.alfa/channels/pelisgratis.json b/plugin.video.alfa/channels/pelisgratis.json index 7f5b5e5d..5bb39d64 100755 --- a/plugin.video.alfa/channels/pelisgratis.json +++ b/plugin.video.alfa/channels/pelisgratis.json @@ -40,6 +40,14 @@ "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 diff --git a/plugin.video.alfa/channels/pelisgratis.py b/plugin.video.alfa/channels/pelisgratis.py index c415d561..1cb80530 100755 --- a/plugin.video.alfa/channels/pelisgratis.py +++ b/plugin.video.alfa/channels/pelisgratis.py @@ -254,6 +254,8 @@ def newest(categoria): item.url = host + 'estrenos' elif categoria == 'infantiles': item.url = host + 'animacion' + elif categoria == 'terror': + item.url = host + 'terror' itemlist = lista(item) if itemlist[-1].title == 'Siguiente >>>': itemlist.pop() diff --git a/plugin.video.alfa/channels/pelisplanet.json b/plugin.video.alfa/channels/pelisplanet.json index d5c61c97..9c5f62a3 100644 --- a/plugin.video.alfa/channels/pelisplanet.json +++ b/plugin.video.alfa/channels/pelisplanet.json @@ -60,6 +60,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/pelisplanet.py b/plugin.video.alfa/channels/pelisplanet.py index 83306a3a..bca441ec 100644 --- a/plugin.video.alfa/channels/pelisplanet.py +++ b/plugin.video.alfa/channels/pelisplanet.py @@ -140,6 +140,8 @@ def newest(categoria): item.url = host elif categoria == 'infantiles': item.url = host + "genero/animacion-e-infantil/" + elif categoria == 'terror': + item.url = host + "genero/terror/" else: return [] diff --git a/plugin.video.alfa/channels/playmax.json b/plugin.video.alfa/channels/playmax.json index b850ccc6..5717c5a3 100755 --- a/plugin.video.alfa/channels/playmax.json +++ b/plugin.video.alfa/channels/playmax.json @@ -71,14 +71,6 @@ "enabled": true, "visible": true }, - { - "id": "include_in_newest_infantiles", - "type": "bool", - "label": "Incluir en Novedades - Infantiles", - "default": false, - "enabled": true, - "visible": true - }, { "id": "modo_grafico", "type": "bool", diff --git a/plugin.video.alfa/channels/sipeliculas.json b/plugin.video.alfa/channels/sipeliculas.json index 62377c04..d7f7a1f2 100755 --- a/plugin.video.alfa/channels/sipeliculas.json +++ b/plugin.video.alfa/channels/sipeliculas.json @@ -28,6 +28,30 @@ "default": false, "enabled": false, "visible": false + }, + { + "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 diff --git a/plugin.video.alfa/channels/sipeliculas.py b/plugin.video.alfa/channels/sipeliculas.py index 95ba9295..9d8a56e4 100755 --- a/plugin.video.alfa/channels/sipeliculas.py +++ b/plugin.video.alfa/channels/sipeliculas.py @@ -141,3 +141,30 @@ def play(item): server=enlaces[0][2], thumbnail=thumbnail, folder=False)) return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'peliculas': + item.url = host + '/cartelera/' + elif categoria == 'infantiles': + item.url = host + "/online/animacion" + elif categoria == 'terror': + item.url = host + "/online/terror/" + else: + return [] + + itemlist = lista(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 \ No newline at end of file diff --git a/plugin.video.alfa/channels/vepelis.json b/plugin.video.alfa/channels/vepelis.json index 535de3d5..e1c5517e 100755 --- a/plugin.video.alfa/channels/vepelis.json +++ b/plugin.video.alfa/channels/vepelis.json @@ -28,6 +28,22 @@ "label": "Incluir en busqueda global", "type": "bool", "visible": true + }, + { + "id": "include_in_newest_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "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 diff --git a/plugin.video.alfa/channels/vepelis.py b/plugin.video.alfa/channels/vepelis.py index 574cce96..1e9f9ef7 100755 --- a/plugin.video.alfa/channels/vepelis.py +++ b/plugin.video.alfa/channels/vepelis.py @@ -10,6 +10,7 @@ from core import tmdb from core.item import Item from platformcode import config, logger +host = 'http://vepelis.com/' def mainlist(item): logger.info() @@ -250,3 +251,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: + if categoria == 'peliculas': + item.url = host + 'ultimas-peliculas' + itemlist = listarpeliculas(item) + elif categoria == 'terror': + item.url = host + "categoria-terror/" + itemlist = listado2(item) + else: + return [] + + 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/verpelis.json b/plugin.video.alfa/channels/verpelis.json index 4ce5372b..d12fd5d7 100644 --- a/plugin.video.alfa/channels/verpelis.json +++ b/plugin.video.alfa/channels/verpelis.json @@ -23,21 +23,37 @@ "direct" ], "settings": [ - { - "id": "modo_grafico", - "type": "bool", - "label": "Buscar información extra", - "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": "modo_grafico", + "type": "bool", + "label": "Buscar información extra", + "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_peliculas", + "type": "bool", + "label": "Incluir en Novedades - Peliculas", + "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 diff --git a/plugin.video.alfa/channels/verpelis.py b/plugin.video.alfa/channels/verpelis.py index 656298ce..5f9a2ac7 100644 --- a/plugin.video.alfa/channels/verpelis.py +++ b/plugin.video.alfa/channels/verpelis.py @@ -198,3 +198,28 @@ def play(item): )) return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'peliculas': + item.url = host + '/ver/' + elif categoria == 'terror': + item.url = host + "/categoria/de-terror.htm" + else: + return [] + + itemlist = scraper(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/yaske.json b/plugin.video.alfa/channels/yaske.json index de44f7df..e46ecee0 100644 --- a/plugin.video.alfa/channels/yaske.json +++ b/plugin.video.alfa/channels/yaske.json @@ -70,6 +70,14 @@ "default": false, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_terror", + "type": "bool", + "label": "Incluir en Novedades - terror", + "default": true, + "enabled": true, + "visible": true } ] } diff --git a/plugin.video.alfa/channels/yaske.py b/plugin.video.alfa/channels/yaske.py index 74024bc4..2f63fccc 100644 --- a/plugin.video.alfa/channels/yaske.py +++ b/plugin.video.alfa/channels/yaske.py @@ -73,6 +73,8 @@ def newest(categoria): item.url = HOST elif categoria == 'infantiles': item.url = HOST + "/genre/16/" + elif categoria == 'terror': + item.url = HOST + "/genre/27/" else: return [] diff --git a/plugin.video.alfa/channels/zonatorrent.json b/plugin.video.alfa/channels/zonatorrent.json index c12b81c3..add8e331 100644 --- a/plugin.video.alfa/channels/zonatorrent.json +++ b/plugin.video.alfa/channels/zonatorrent.json @@ -27,6 +27,30 @@ "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 } ] } diff --git a/plugin.video.alfa/channels/zonatorrent.py b/plugin.video.alfa/channels/zonatorrent.py index 8c637e7c..d9bede31 100644 --- a/plugin.video.alfa/channels/zonatorrent.py +++ b/plugin.video.alfa/channels/zonatorrent.py @@ -157,3 +157,30 @@ def findvideos(item): fulltitle=item.title, thumbnail=get_thumb("channels_torrent.png"))) return itemlist + +def newest(categoria): + logger.info() + itemlist = [] + item = Item() + try: + if categoria == 'peliculas': + item.url = HOST + elif categoria == 'infantiles': + item.url = HOST + "/animacion" + elif categoria == 'terror': + item.url = HOST + "/terror/" + else: + return [] + + itemlist = 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/resources/media/general/default/thumb_channels_horror.png b/plugin.video.alfa/resources/media/general/default/thumb_channels_horror.png index cf5b7b1f..0d9abdf0 100644 Binary files a/plugin.video.alfa/resources/media/general/default/thumb_channels_horror.png and b/plugin.video.alfa/resources/media/general/default/thumb_channels_horror.png differ