diff --git a/channels.json b/channels.json index 53f1eb08..5572180b 100644 --- a/channels.json +++ b/channels.json @@ -3,50 +3,61 @@ "altadefinizione01_link": "http://altadefinizione01.link", "altadefinizione01": "https://altadefinizione01.to", "altadefinizioneclick": "https://altadefinizione.cloud", - - "altadefinizioneclub": "https://altadefinizione.cloud", - "altadefinizionehd": "https://altadefinizionehd.org", + "altadefinizionehd": "https://altadefinizione.doctor", "animeforge": "https://ww1.animeforce.org", "animeleggendari": "https://animepertutti.com", "animestream": "https://www.animeworld.it", + "animespace": "https://animespace.tv", "animesubita": "http://www.animesubita.org", "animetubeita": "http://www.animetubeita.com", "animevision": "https://www.animevision.it", "animeworld": "https://www.animeworld.it", "asiansubita": "http://asiansubita.altervista.org", "casacinema": "https://www.casacinema.site", - "cb01anime": "http://www.cineblog01.ink/anime/", - "cineblog01": "https://cb01.tools", - "documentaristreamingdb": "https://documentari-streaming-da.com", - "downloadme": "https://www.downloadme.gratis", - "dragonballforever": "https://www.dragonballforever.it", + "casacinemainfo": "https://www.casacinema.info", + "cb01anime": "http://www.cineblog01.ink", + "cinemalibero": "https://cinemalibero.icu", + "cinemastreaming": "https://cinemastreaming.icu", + "documentaristreamingda": "https://documentari-streaming-da.com", "dreamsub": "https://www.dreamsub.stream", "eurostreaming": "https://eurostreaming.gratis", "eurostreaming_video": "https://www.eurostreaming.best", "fastsubita": "http://fastsubita.com", "ffilms":"https://ffilms.org", + "filmigratis": "https://filmigratis.net", "filmgratis": "https://www.filmaltadefinizione.net", "filmontv": "https://www.comingsoon.it", "filmpertutti": "https://www.filmpertutti.tube", + "filmsenzalimiti": "https://filmsenzalimiti.best", + "filmsenzalimiticc": "https://www.filmsenzalimiti.host", "filmsenzalimiti_blue": "https://filmsenzalimiti.best", "filmsenzalimiti_info": "https://www.filmsenzalimiti.host", "filmstreaming01": "https://filmstreaming01.com", "filmstreamingita": "http://filmstreamingita.live", "guarda_serie": "https://guardaserie.site", "guardafilm": "http://www.guardafilm.top", + "guardarefilm": "https://www.guardarefilm.video", + "guardaseriecc": "https://guardaserie.site", + "guardaserieclick": "https://www.guardaserie.media", "guardaserie_stream": "https://guardaserie.co", "guardaserieonline": "http://www.guardaserie.media", "guardogratis": "http://guardogratis.io", "ilgeniodellostreaming": "https://ilgeniodellostreaming.pw", - "italiaserie": "https://italiaserie.org", "italiafilm": "https://www.italia-film.pw", - "italiafilmvedohd": "https://italiafilm.info", - "italiaserie_uno": "https:://italiaserie.org", + "italiafilmhd": "https://italiafilm.info", + "italiaserie": "https://italiaserie.org", + "itastreaming": "https://itastreaming.film", "majintoon": "https://toonitalia.org", + "mondolunatico": "http://mondolunatico.org", + "mondolunatico2": "http://mondolunatico.org/stream/", "mondoserietv": "https://mondoserietv.com", "piratestreaming": "https://www.piratestreaming.watch", "seriehd": "https://www.seriehd.info", "serietvonline": "https://serietvonline.xyz", + "serietvsubita": "http://serietvsubita.xyz", "serietvu": "https://www.serietvu.club", - "tantifilm": "https://www.tantifilm.plus" + "streamingaltadefinizione": "https://www.streamingaltadefinizione.space", + "streamking": "http://streamking.cc", + "tantifilm": "https://www.tantifilm.plus", + "toonitalia": "https://toonitalia.org" } diff --git a/channels/LIKUOO.py b/channels/LIKUOO.py index fbeb3023..f42ed721 100644 --- a/channels/LIKUOO.py +++ b/channels/LIKUOO.py @@ -8,6 +8,7 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://www.likuoo.video' diff --git a/channels/TXXX.py b/channels/TXXX.py index 26c8137a..253b7312 100644 --- a/channels/TXXX.py +++ b/channels/TXXX.py @@ -8,6 +8,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://www.txxx.com' diff --git a/channels/absoluporn.py b/channels/absoluporn.py index f5fce909..e5774e59 100644 --- a/channels/absoluporn.py +++ b/channels/absoluporn.py @@ -7,6 +7,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://www.absoluporn.es' diff --git a/channels/alsoporn.py b/channels/alsoporn.py index 1ada8f96..306d00d5 100644 --- a/channels/alsoporn.py +++ b/channels/alsoporn.py @@ -7,6 +7,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://www.alsoporn.com' diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py index a9f17b5e..dd186a5e 100644 --- a/channels/altadefinizione01.py +++ b/channels/altadefinizione01.py @@ -12,7 +12,7 @@ from specials import autoplay #host = "https://altadefinizione01.to" __channel__ = "altadefinizione01" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py index b24bf0b2..47acc6d8 100644 --- a/channels/altadefinizione01_club.py +++ b/channels/altadefinizione01_club.py @@ -49,9 +49,9 @@ def mainlist(item): support.menu(itemlist, 'Film Ultimi Arrivi bold', 'peliculas', host, args='pellicola') support.menu(itemlist, 'Genere', 'categorie', host, args='genres') support.menu(itemlist, 'Per anno submenu', 'categorie', host, args=['Film per Anno','years']) - support.menu(itemlist, 'Per lettera', 'categorie', host+'catalog/a/', args=['Film per Lettera','orderalf']) - support.menu(itemlist, 'Al Cinema bold', 'peliculas', host+'cinema/', args='pellicola') - support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host+'sub-ita/', args='pellicola') + support.menu(itemlist, 'Per lettera', 'categorie', host + '/catalog/a/', args=['Film per Lettera','orderalf']) + support.menu(itemlist, 'Al Cinema bold', 'peliculas', host + '/cinema/', args='pellicola') + support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host + '/sub-ita/', args='pellicola') support.menu(itemlist, 'Cerca film submenu', 'search', host) autoplay.show_option(item.channel, itemlist) @@ -234,7 +234,7 @@ def search(item, text): logger.info("%s mainlist search log: %s %s" % (__channel__, item, text)) itemlist = [] text = text.replace(" ", "+") - item.url = host+"index.php?do=search&story=%s&subaction=search" % (text) + item.url = host + "/index.php?do=search&story=%s&subaction=search" % (text) #item.extra = "search" try: return peliculas(item) diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py index b46e87b6..584e175b 100644 --- a/channels/altadefinizione01_link.py +++ b/channels/altadefinizione01_link.py @@ -34,24 +34,17 @@ def mainlist(item): support.menu(itemlist, 'Film per Genere', 'genres', host, args='genres') support.menu(itemlist, 'Film per Anno submenu', 'genres', host, args='years') support.menu(itemlist, 'Film per Qualità submenu', 'genres', host, args='quality') - support.menu(itemlist, 'Al Cinema bold', 'peliculas', host+'film-del-cinema') - support.menu(itemlist, 'Popolari bold', 'peliculas', host+'piu-visti.html') + support.menu(itemlist, 'Al Cinema bold', 'peliculas', host + '/film-del-cinema') + support.menu(itemlist, 'Popolari bold', 'peliculas', host + '/piu-visti.html') support.menu(itemlist, 'Mi sento fortunato bold', 'genres', host, args='lucky') - support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host+'film-sub-ita/') + support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host + '/film-sub-ita/') support.menu(itemlist, 'Cerca film submenu', 'search', host) # per autoplay autoplay.init(item.channel, list_servers, list_quality) autoplay.show_option(item.channel, itemlist) - itemlist.append( - Item(channel='setting', - action="channel_config", - title=support.typo("Configurazione Canale color lime"), - config=item.channel, - folder=False, - thumbnail=channelselector.get_thumb('setting_0.png')) - ) + support.channel_config(item, itemlist) return itemlist diff --git a/channels/altadefinizionehd.py b/channels/altadefinizionehd.py index 33693d4f..08757113 100644 --- a/channels/altadefinizionehd.py +++ b/channels/altadefinizionehd.py @@ -10,7 +10,8 @@ from core.item import Item from platformcode import logger, config from specials import autoplay -host = "https://altadefinizione.doctor" +__channel__ = 'altadefinizionehd' +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/analdin.py b/channels/analdin.py index 9520d314..278d1433 100644 --- a/channels/analdin.py +++ b/channels/analdin.py @@ -7,6 +7,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = 'https://www.analdin.com/es' diff --git a/channels/animeforce.py b/channels/animeforce.py index 4113f6c5..54a14d80 100644 --- a/channels/animeforce.py +++ b/channels/animeforce.py @@ -12,7 +12,8 @@ from core.item import Item from platformcode import config, logger from servers.decrypters import adfly -host = "https://ww1.animeforce.org" +__channel__ = "animeforge" +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() @@ -477,7 +478,7 @@ def scrapedSingle(url="", single="", patron=""): def Crea_Url(pagina="1", azione="ricerca", categoria="", nome=""): # esempio # chiamate.php?azione=ricerca&cat=&nome=&pag= - Stringa = host + "chiamate.php?azione=" + azione + "&cat=" + categoria + "&nome=" + nome + "&pag=" + pagina + Stringa = host + "/chiamate.php?azione=" + azione + "&cat=" + categoria + "&nome=" + nome + "&pag=" + pagina log("crea_Url", Stringa) return Stringa diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index 8ac1b391..dfc9371e 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -12,7 +12,8 @@ from lib.js2py.host import jsfunctions from platformcode import logger, config from specials import autoplay, autorenumber -host = "https://animepertutti.com" +__channel__ = "animeleggendari" +host = config.get_channel_url(__channel__) # Richiesto per Autoplay IDIOMAS = {'Italiano': 'IT'} @@ -34,7 +35,6 @@ def mainlist(item): 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.init(item.channel, list_servers, list_quality) autoplay.show_option(item.channel, itemlist) @@ -137,7 +137,7 @@ def episodios(item): itemlist.append( Item(channel=item.channel, action='findvideos', - contentType=item.contentType, + contentType='episode', title=support.typo('Episodio 1 bold'), fulltitle=item.title, url=item.url, @@ -149,7 +149,7 @@ def episodios(item): itemlist.append( Item(channel=item.channel, action='findvideos', - contentType=item.contentType, + contentType='episode', title=support.typo('Episodio ' + number,'bold'), fulltitle=item.title, url=url, diff --git a/channels/animespace.py b/channels/animespace.py index aa910a86..4f9b88b0 100644 --- a/channels/animespace.py +++ b/channels/animespace.py @@ -15,7 +15,8 @@ from platformcode import logger, config from specials import autoplay from specials import renumbertools -host = "https://animespace.tv/" +__channel__ = "animespace" +host = config.get_channel_url(__channel__) checklinks = config.get_setting('checklinks', 'animespace') checklinks_number = config.get_setting('checklinks_number', 'animespace') @@ -41,42 +42,42 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, title="Ultimas", action="list_all", thumbnail=get_thumb('last', auto=True), - url=host + 'emision')) + url=host + '/emision')) itemlist.append(Item(channel=item.channel, title="Todas", action="list_all", thumbnail=get_thumb('all', auto=True), - url=host + 'animes')) + url=host + '/animes')) itemlist.append(Item(channel=item.channel, title="Anime", action="list_all", thumbnail=get_thumb('anime', auto=True), - url=host + 'categoria/anime')) + url=host + '/categoria/anime')) itemlist.append(Item(channel=item.channel, title="Películas", action="list_all", thumbnail=get_thumb('movies', auto=True), - url=host + 'categoria/pelicula')) + url=host + '/categoria/pelicula')) itemlist.append(Item(channel=item.channel, title="OVAs", action="list_all", thumbnail='', - url=host + 'categoria/ova')) + url=host + '/categoria/ova')) itemlist.append(Item(channel=item.channel, title="ONAs", action="list_all", thumbnail='', - url=host + 'categoria/ona')) + url=host + '/categoria/ona')) itemlist.append(Item(channel=item.channel, title="Especiales", action="list_all", thumbnail='', - url=host + 'categoria/especial')) + url=host + '/categoria/especial')) itemlist.append(Item(channel=item.channel, title="Buscar", action="search", - url=host + 'search?q=', + url=host + '/search?q=', thumbnail=get_thumb('search', auto=True), fanart='https://s30.postimg.cc/pei7txpa9/buscar.png' )) diff --git a/channels/animesubita.py b/channels/animesubita.py index 5559f58b..80e4e08a 100644 --- a/channels/animesubita.py +++ b/channels/animesubita.py @@ -13,8 +13,8 @@ from core import httptools, scrapertools, tmdb, support from core.item import Item from platformcode import logger, config -host = "http://www.animesubita.org" - +__channel__ = "animesubita" +host = config.get_channel_url(__channel__) PERPAGE = 20 # ---------------------------------------------------------------------------------------------------------------- diff --git a/channels/animetubeita.py b/channels/animetubeita.py index 817d77d7..d261c048 100644 --- a/channels/animetubeita.py +++ b/channels/animetubeita.py @@ -10,7 +10,8 @@ from core import httptools, scrapertools, tmdb from core.item import Item from platformcode import logger, config -host = "http://www.animetubeita.com" +__channel__ = "animetubeita" +host = config.get_channel_url(__channel__) hostlista = host + "/lista-anime/" hostgeneri = host + "/generi/" hostcorso = host + "/category/serie-in-corso/" diff --git a/channels/animeworld.py b/channels/animeworld.py index 8272fbe3..aa8204e0 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -13,7 +13,8 @@ from core.item import Item from platformcode import logger, config from specials import autoplay, autorenumber -host = config.get_setting("channel_host", 'animeworld') +__channel__ = "animeworld" +host = config.get_channel_url(__channel__) headers = [['Referer', host]] IDIOMAS = {'Italiano': 'Italiano'} @@ -229,7 +230,7 @@ def video(item): # Controlla se sono Episodi o Film if movie == '': - contentType = 'episode' + contentType = 'tvshow' action = 'episodios' else: contentType = 'movie' @@ -256,65 +257,45 @@ def video(item): def episodios(item): log() - itemlist = [] - - data = httptools.downloadpage(item.url, headers=headers).data.replace('\n', '') - block1 = scrapertoolsV2.find_single_match(data, r'