From 3be064d67db62bf0b87c6b4dd66aa4bbd27408c8 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Mon, 29 Apr 2019 12:16:52 +0200 Subject: [PATCH 01/16] Fix autorenumber --- channels/autorenumber.py | 2 +- resources/language/English/strings.po | 2 +- resources/language/Italian/strings.po | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/channels/autorenumber.py b/channels/autorenumber.py index e05e8ed1..bd031c32 100644 --- a/channels/autorenumber.py +++ b/channels/autorenumber.py @@ -64,7 +64,7 @@ def add_season(data=None): special = platformtools.dialog_numeric(0, heading) return [int(season), int(episode), int(special)] elif episode != '': - return [int(season), int(episode)] + return [int(season), int(episode), ''] def write_data(channel, show, data): diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 635fcb3b..9b594683 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -10020,7 +10020,7 @@ msgid "Do you want to update Quasar to avoid errors?" msgstr "" msgctxt "#70585" -msgid "RENUMBERING" +msgid "[B]Renumbering[/B] (beta)" msgstr "" msgctxt "#70586" diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 6e537531..763e2824 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5004,8 +5004,8 @@ msgid "Do you want to update Quasar to avoid errors?" msgstr "Vuoi aggiornare Quasar per evitare errori?" msgctxt "#70585" -msgid "RENUMBERING" -msgstr "RINUMERAZIONE" +msgid "[B]Renumbering[/B] (beta)" +msgstr "[B]Rinumerazione[/B] (beta)" msgctxt "#70586" msgid "Set up series number..." From 154acdefdd86ff20d668ba6755f1989e52ed5bf9 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Mon, 29 Apr 2019 19:41:12 +0200 Subject: [PATCH 02/16] AnimeLegendari rewritten > AnimePerTutti --- channels/animeleggendari.json | 12 +- channels/animeleggendari.py | 258 ++++++++---------- channels/autorenumber.py | 4 - .../media/channels/banner/animepertutti.png | Bin 0 -> 54523 bytes .../media/channels/thumb/animepertutti.png | Bin 0 -> 32062 bytes 5 files changed, 117 insertions(+), 157 deletions(-) create mode 100644 resources/media/channels/banner/animepertutti.png create mode 100644 resources/media/channels/thumb/animepertutti.png diff --git a/channels/animeleggendari.json b/channels/animeleggendari.json index e420e026..2306345e 100644 --- a/channels/animeleggendari.json +++ b/channels/animeleggendari.json @@ -1,11 +1,11 @@ { "id": "animeleggendari", - "name": "AnimeLeggendari", + "name": "AnimePerTutti", "active": true, "adult": false, "language": ["ita"], - "thumbnail": "https://animeleggendari.com/wp-content/uploads/2018/01/123header.jpg", - "bannermenu": "https://animeleggendari.com/wp-content/uploads/2018/01/123header.jpg", + "thumbnail": "animepertutti.png", + "bannermenu": "animepertutti.png", "categories": ["anime"], "settings": [ { @@ -20,9 +20,9 @@ "id": "include_in_newest_anime", "type": "bool", "label": "Includi in Novità - Anime", - "default": false, - "enabled": false, - "visible": false + "default": true, + "enabled": true, + "visible": true }, { "id": "include_in_newest_italiano", diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index b17ee1d6..cafadb64 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -1,18 +1,18 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ -# Ringraziamo Icarus crew # Canale per animeleggendari # ------------------------------------------------------------ import re -from channels import autoplay -from channels import filtertools, support -from core import servertools, httptools, scrapertools, tmdb +from channels import filtertools, autoplay, support, autorenumber +from channels.support import log, menu +from core import servertools, httptools, scrapertoolsV2, scrapertools, tmdb from platformcode import logger, config from core.item import Item +from lib.js2py.host import jsfunctions -host = "https://animeleggendari.com" +host = "https://animepertutti.com" # Richiesto per Autoplay IDIOMAS = {'Italiano': 'IT'} @@ -24,57 +24,29 @@ __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animeleggendari __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animeleggendari') def mainlist(item): - logger.info('[animeleggendari.py] mainlist') - - # Richiesto per Autoplay - autoplay.init(item.channel, list_servers, list_quality) - - itemlist = [Item(channel=item.channel, - action="lista_anime", - title="[B]Anime Leggendari[/B]", - url="%s/category/anime-leggendari/" % host, - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="lista_anime", - title="Anime [B]ITA[/B]", - url="%s/category/anime-ita/" % host, - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="lista_anime", - title="Anime [B]SUB ITA[/B]", - url="%s/category/anime-sub-ita/" % host, - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="lista_anime", - title="Conclusi", - url="%s/category/serie-anime-concluse/" % host, - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="lista_anime", - title="In Corso", - url="%s/category/anime-in-corso/" % host, - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="generi", - title="Generi >", - url=host, - thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"), - Item(channel=item.channel, - action="search", - title="[B]Cerca...[/B]", - thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")] + log() + + itemlist = [] + menu(itemlist, 'Anime Leggendari', 'peliculas', host + '/category/anime-leggendari/') + menu(itemlist, 'Anime ITA', 'peliculas', host + '/category/anime-ita/') + menu(itemlist, 'Anime SUB-ITA', 'peliculas', host + '/category/anime-sub-ita/') + menu(itemlist, 'Anime Conclusi', 'peliculas', host + '/category/serie-anime-concluse/') + menu(itemlist, 'Anime in Corso', 'peliculas', host + '/category/anime-in-corso/') + menu(itemlist, 'Genere', 'genres', host) + menu(itemlist, 'Cerca...', 'search') + menu(itemlist, 'novita', 'newest') - # Autoplay visualizza voce menu + autoplay.init(item.channel, list_servers, list_quality) autoplay.show_option(item.channel, itemlist) return itemlist def search(item, texto): - logger.info('[animeleggendari.py] search') + log(texto) item.url = host + "/?s=" + texto try: - return lista_anime(item) + return peliculas(item) # Continua la ricerca in caso di errore except: @@ -83,139 +55,131 @@ def search(item, texto): logger.error("%s" % line) return [] -def generi(item): - logger.info('[animeleggendari.py] generi') +def last_ep(item): + log('ANIME PER TUTTI') + return support.scrape(item, '([^<]+)<', ['url','title'],patron_block='