From 2cb6cfdb153ef80326e1b6739ad7d4585d2a595d Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Wed, 5 Jun 2019 11:36:56 +0200 Subject: [PATCH 01/19] series download now works also with scrape --- specials/downloads.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/specials/downloads.py b/specials/downloads.py index d92bf955..dad71e62 100644 --- a/specials/downloads.py +++ b/specials/downloads.py @@ -503,7 +503,7 @@ def download_from_server(item): unsupported_servers = ["torrent"] progreso = platformtools.dialog_progress(config.get_localized_string(30101), config.get_localized_string(70178) % item.server) - channel = __import__(item.contentChannel, None, None, [item.contentChannel]) + channel = __import__('channels.%s' % item.contentChannel, None, None, ['channels.%s' % item.contentChannel]) if hasattr(channel, "play") and not item.play_menu: progreso.update(50, config.get_localized_string(70178) % item.server, config.get_localized_string(60003) % item.contentChannel) @@ -570,7 +570,7 @@ def download_from_best_server(item): result = {"downloadStatus": STATUS_CODES.error} progreso = platformtools.dialog_progress(config.get_localized_string(30101), config.get_localized_string(70179)) - channel = __import__(item.contentChannel, None, None, [item.contentChannel]) + channel = __import__('channels.%s' % item.contentChannel, None, None, ['channels.%s' % item.contentChannel]) progreso.update(50, config.get_localized_string(70184), config.get_localized_string(70180) % item.contentChannel) @@ -756,8 +756,8 @@ def save_download(item): # Menu contextual if item.from_action and item.from_channel: - item.channel = str(item.from_channel) - item.action = str(item.from_action) + item.channel = item.from_channel + item.action = item.from_action del item.from_action del item.from_channel @@ -848,6 +848,7 @@ def save_download_tvshow(item): config.get_localized_string(30109)) else: for i in episodes: + i.contentChannel = item.contentChannel res = start_download(i) if res == STATUS_CODES.canceled: break From 7f2fe7940d73cc3d0ab009fbf7a5425e83c5d6b8 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Wed, 5 Jun 2019 12:00:48 +0200 Subject: [PATCH 02/19] tvshow fix --- channels/animeworld.py | 2 +- channels/eurostreaming.py | 12 ++++++------ channels/fastsubita.py | 2 +- channels/filmigratis.py | 8 ++++---- channels/filmsenzalimiticc.py | 10 +++++----- channels/guardaserieclick.py | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/channels/animeworld.py b/channels/animeworld.py index 8272fbe3..38ce5f24 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -229,7 +229,7 @@ def video(item): # Controlla se sono Episodi o Film if movie == '': - contentType = 'episode' + contentType = 'tvshow' action = 'episodios' else: contentType = 'movie' diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index 224e6cd8..9969f7a2 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -37,11 +37,11 @@ def mainlist(item): support.log() itemlist = [] - support.menu(itemlist, 'Serie TV', 'serietv', host, 'episode') # mettere sempre episode per serietv, anime!! - support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "category/serie-tv-archive/", 'episode') - support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + 'aggiornamento-episodi/', 'episode', args='True') - support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + 'category/anime-cartoni-animati/', 'episode') - support.menu(itemlist, 'Cerca...', 'search', host, 'episode') + support.menu(itemlist, 'Serie TV', 'serietv', host, 'tvshow') # mettere sempre episode per serietv, anime!! + support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "category/serie-tv-archive/", 'tvshow') + support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + 'aggiornamento-episodi/', 'tvshow', args='True') + support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + 'category/anime-cartoni-animati/', 'tvshow') + support.menu(itemlist, 'Cerca...', 'search', host, 'tvshow') # richiesto per autoplay autoplay.init(item.channel, list_servers, list_quality) @@ -105,7 +105,7 @@ def episodios(item): itemlist.append( Item(channel=item.channel, action="findvideos", - contentType=item.contentType, + contentType='episode', title="[B]" + season_n + "x" + episode_n + " " + titolo + "[/B] " + season_lang, fulltitle=item.title, # Titolo nel video show=titolo + ":" + season_n + "x" + episode_n, # sottotitoletto nel video diff --git a/channels/fastsubita.py b/channels/fastsubita.py index 0dae9dbe..bc7e1c5e 100644 --- a/channels/fastsubita.py +++ b/channels/fastsubita.py @@ -311,7 +311,7 @@ def episodios(item, itemlist=[]): itemlist.append( Item(channel=item.channel, action="findvideos", - contentTpye="tvshow", + contentTpye="episode", title=title, fulltitle=scrapedtitle, url=scrapedurl, diff --git a/channels/filmigratis.py b/channels/filmigratis.py index a900ae40..e66076f9 100644 --- a/channels/filmigratis.py +++ b/channels/filmigratis.py @@ -32,9 +32,9 @@ def mainlist(item): support.menu(itemlist, 'Al Cinema bold', 'carousel', host, contentType='movie') support.menu(itemlist, 'Film alta definizione bold', 'peliculas', host, contentType='movie', args='film') support.menu(itemlist, 'Categorie Film bold', 'categorias_film', host , contentType='movie', args='film') - support.menu(itemlist, 'Categorie Serie bold', 'categorias_serie', host, contentType='episode', args='serie') + support.menu(itemlist, 'Categorie Serie bold', 'categorias_serie', host, contentType='tvshow', args='serie') support.menu(itemlist, '[COLOR blue]Cerca Film...[/COLOR] bold', 'search', host, contentType='movie', args='film') - support.menu(itemlist, '[COLOR blue]Cerca Serie...[/COLOR] bold', 'search', host, contentType='episode', args='serie') + support.menu(itemlist, '[COLOR blue]Cerca Serie...[/COLOR] bold', 'search', host, contentType='tvshow', args='serie') autoplay.init(item.channel, list_servers, list_quality) autoplay.show_option(item.channel, itemlist) @@ -142,7 +142,7 @@ def categorias_serie(item): for scrapedurl, scrapedtitle in matches: itemlist.append( Item(channel=channel, - contentType='episode', + contentType='tvshow', action="peliculas_serie", title="[COLOR azure]" + scrapedtitle + "[/COLOR]", url=scrapedurl, @@ -205,7 +205,7 @@ def peliculas_serie(item): itemlist.append( Item(channel=item.channel, action="episodios", - contentType='episode', + contentType='tvshow', title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py index e4029d77..0d9e3b94 100644 --- a/channels/filmsenzalimiticc.py +++ b/channels/filmsenzalimiticc.py @@ -53,7 +53,7 @@ def mainlist(item): action='video', title='Serie TV', url=host+'/serie-tv/', - contentType='episode', + contentType='tvshow', thumbnail=''), Item(channel=item.channel, action='sottomenu_serie', @@ -119,19 +119,19 @@ def sottomenu_serie(item): action='video', title='Serie TV HD', url=host+'/watch-genre/serie-altadefinizione/', - contentType='episode', + contentType='tvshow', thumbnail=''), Item(channel=item.channel, action='video', title='Miniserie', url=host+'/watch-genre/miniserie/', - contentType='episode', + contentType='tvshow', thumbnail=''), Item(channel=item.channel, action='video', title='Programmi TV', url=host+'/watch-genre/programmi-tv/', - contentType='episode', + contentType='tvshow', thumbnail='') ] @@ -166,7 +166,7 @@ def video(item): if item.contentType == 'movie': azione = 'findvideos' tipologia = 'movie' - if item.contentType == 'episode': + if item.contentType == 'tvshow': azione='episodios' tipologia = 'tv' diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py index c451326f..af3eaf8f 100644 --- a/channels/guardaserieclick.py +++ b/channels/guardaserieclick.py @@ -120,7 +120,7 @@ def nuoveserie(item): itemlist.append( Item(channel=item.channel, action="episodios", - contentType="episode", + contentType="tvshow", title=scrapedtitle, fulltitle=scrapedtitle, url=scrapedurl, @@ -165,7 +165,7 @@ def serietvaggiornate(item): itemlist.append( Item(channel=item.channel, action="findepvideos", - contentType="episode", + contentType="tvshow", title=title, show=scrapedtitle, fulltitle=scrapedtitle, From 8d74126db07499858c599efc368a377aa53dce62 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Wed, 5 Jun 2019 18:46:40 +0200 Subject: [PATCH 03/19] SpeedUp Animeworld --- channels/animeworld.py | 50 ++++++++++++------------------------------ core/support.py | 11 +++++----- 2 files changed, 20 insertions(+), 41 deletions(-) diff --git a/channels/animeworld.py b/channels/animeworld.py index 38ce5f24..a48a2e6e 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -256,65 +256,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'
(.*?)
') - - patron = r'
  • (.*?)<\/a>' - matches = re.compile(patron, re.DOTALL).findall(block) - - extra = {} - extra['data'] = block1.replace('Attenzione! Non ci sono episodi in questa sezione, torna indietro!.','') + itemlist = [] + + patron_block = r'
    (.*?)') - servers = scrapertoolsV2.find_multiple_matches(block,r'class="tab.*?data-name="([0-9]+)">([^<]+)([^<]+)(.*?)')) - id = scrapertoolsV2.find_single_match(data,r'(.*?)
    Date: Wed, 5 Jun 2019 20:04:44 +0200 Subject: [PATCH 04/19] Revert commit by @mac12m99 --- core/support.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/support.py b/core/support.py index 6d85fa03..72cbef53 100644 --- a/core/support.py +++ b/core/support.py @@ -576,6 +576,12 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True): from platformcode.config import get_setting CL = get_setting('checklinks') or get_setting('checklinks', item.channel) + autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY') + channel_node = autoplay_node.get(item.channel, {}) + if not channel_node: # non ha mai aperto il menu del canale quindi in autoplay_data.json non c'e la key + channelFile = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel]) + autoplay.init(item.channel, channelFile.list_servers, channelFile.list_quality) + autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY') channel_node = autoplay_node.get(item.channel, {}) settings_node = channel_node.get('settings', {}) From b17f0996d5d1ffc3ba76e41c257a04579237a62b Mon Sep 17 00:00:00 2001 From: Alhaziel <46535975+lozioangie@users.noreply.github.com> Date: Wed, 5 Jun 2019 22:46:36 +0200 Subject: [PATCH 05/19] smal fix --- channels/animeleggendari.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index 8ac1b391..d193cc24 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -34,7 +34,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 +136,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 +148,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, From c7151389727c30e18c0c996790ae0cdf4d9c9fe0 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Thu, 6 Jun 2019 10:48:19 +0200 Subject: [PATCH 06/19] Pagination for "Aggiornamenti serie tv'" --- channels/cineblog01.py | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 208c2c87..38cbcaf6 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -118,13 +118,19 @@ def last(item): itemlist = [] infoLabels = {} quality = '' + PERPAGE = 20 + page = 1 + if item.page: + page = item.page if item.contentType == 'tvshow': matches = support.match(item, r']+)".*?>([^(:(|[)]+)([^<]+)<\/a>', '
    - + From da4a26d03f51ec961c4237ccf038185be0c92cb0 Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Thu, 6 Jun 2019 12:09:58 +0200 Subject: [PATCH 08/19] Bullet point for almost all fonts --- core/servertools.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/servertools.py b/core/servertools.py index 8ecea6fd..f0e07a36 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -725,14 +725,14 @@ def check_video_link(url, server, timeout=3): :param url, server: Link y servidor :return: str(2) '??':No se ha podido comprobar. 'Ok':Parece que el link funciona. 'NO':Parece que no funciona. """ + + NK = "[COLOR 0xFFF9B613][B]" + u"\u2022".encode('utf-8') + "[/B][/COLOR]" + OK = "[COLOR 0xFF00C289][B]" + u"\u2022".encode('utf-8') + "[/B][/COLOR]" + KO = "[COLOR 0xFFC20000][B]" + u"\u2022".encode('utf-8') + "[/B][/COLOR]" - NK = "[COLOR 0xFFF9B613][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]" - OK = "[COLOR 0xFF00C289][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]" - KO = "[COLOR 0xFFC20000][B]" + u"\u25cf".encode('utf-8') + "[/B][/COLOR]" - - # NK = "[COLOR 0xFFF9B613][B]O[/B][/COLOR]" - # OK = "[COLOR 0xFF00C289][B]O[/B][/COLOR]" - # KO = "[COLOR 0xFFC20000][B]O[/B][/COLOR]" + # NK = "[COLOR 0xFFF9B613][B]♥[/B][/COLOR]" + # OK = "[COLOR 0xFF00C289][B]♥[/B][/COLOR]" + # KO = "[COLOR 0xFFC20000][B]♥[/B][/COLOR]" try: server_module = __import__('servers.%s' % server, None, None, ["servers.%s" % server]) From aeffad02a9c6ef5d89a5d8c2337894a819db7500 Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 17:21:27 +0200 Subject: [PATCH 09/19] updating json + dynimininininic chanels --- channels.json | 10 ++++++---- channels/altadefinizionehd.py | 3 ++- channels/animeforce.py | 3 ++- channels/animeleggendari.py | 3 ++- channels/animespace.py | 3 ++- channels/animesubita.py | 4 ++-- channels/animetubeita.py | 3 ++- channels/animeworld.py | 3 ++- channels/casacinema.py | 4 ++-- channels/casacinemaInfo.py | 4 ++-- channels/cb01anime.py | 4 ++-- channels/cinemalibero.py | 4 ++-- channels/cinemastreaming.py | 4 ++-- 13 files changed, 30 insertions(+), 22 deletions(-) diff --git a/channels.json b/channels.json index 53f1eb08..4a172b0e 100644 --- a/channels.json +++ b/channels.json @@ -3,20 +3,22 @@ "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/", + "casacinemainfo": "https://www.casacinema.info", + "cb01anime": "http://www.cineblog01.ink", "cineblog01": "https://cb01.tools", + "cinemalibero": "https://cinemalibero.icu", + "cinemastreaming": "https://cinemastreaming.icu", "documentaristreamingdb": "https://documentari-streaming-da.com", "downloadme": "https://www.downloadme.gratis", "dragonballforever": "https://www.dragonballforever.it", 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/animeforce.py b/channels/animeforce.py index 4113f6c5..c38b6d1b 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() diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index d193cc24..0a30683b 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_addon_version(__channel__) # Richiesto per Autoplay IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/animespace.py b/channels/animespace.py index aa910a86..5f57479e 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_addon_version(__channel__) checklinks = config.get_setting('checklinks', 'animespace') checklinks_number = config.get_setting('checklinks_number', 'animespace') diff --git a/channels/animesubita.py b/channels/animesubita.py index 5559f58b..744d0365 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_addon_version(__channel__) PERPAGE = 20 # ---------------------------------------------------------------------------------------------------------------- diff --git a/channels/animetubeita.py b/channels/animetubeita.py index 817d77d7..55554e7e 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_addon_version(__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 a48a2e6e..c1814d7e 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_addon_version(__channel__) headers = [['Referer', host]] IDIOMAS = {'Italiano': 'Italiano'} diff --git a/channels/casacinema.py b/channels/casacinema.py index 07d889de..54abcbf5 100644 --- a/channels/casacinema.py +++ b/channels/casacinema.py @@ -12,8 +12,8 @@ from core.item import Item from platformcode import logger, config from specials import autoplay -host = 'https://www.casacinema.site' - +__channel__ = "casacinema" +host = config.get_addon_version(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py index c9c969ed..e9ee4a60 100644 --- a/channels/casacinemaInfo.py +++ b/channels/casacinemaInfo.py @@ -8,8 +8,8 @@ from core.item import Item from platformcode import logger, config from specials import autoplay -host = 'https://casacinema.info' - +__channel__ = "casacinemainfo" +host = config.get_addon_version(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] diff --git a/channels/cb01anime.py b/channels/cb01anime.py index f68fbe6f..b1a485f1 100644 --- a/channels/cb01anime.py +++ b/channels/cb01anime.py @@ -10,8 +10,8 @@ from core import httptools, scrapertools, servertools, tmdb from core.item import Item from platformcode import logger, config -host = "https://www.cineblog01.pink" - +__channel__ = "cb01anime" +host = config.get_addon_version(__channel__) #esclusione degli articoli 'di servizio' blacklist = ['AVVISO IMPORTANTE – CB01.ROCKS', 'Lista Alfabetica Completa Anime/Cartoon', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE'] diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index 2709560f..7f60fcb8 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -22,8 +22,8 @@ list_quality = ['default'] checklinks = config.get_setting('checklinks', 'cinemalibero') checklinks_number = config.get_setting('checklinks_number', 'cinemalibero') -host = 'https://www.cinemalibero.icu' - +__channel__ = "cinemalibero" +host = config.get_addon_version(__channel__) headers = [['Referer', host]] diff --git a/channels/cinemastreaming.py b/channels/cinemastreaming.py index 23df9ca4..8f5df8d2 100644 --- a/channels/cinemastreaming.py +++ b/channels/cinemastreaming.py @@ -8,8 +8,8 @@ from core import scrapertools, httptools, scrapertoolsV2, support from core.item import Item from specials import autoplay -host = 'https://cinemastreaming.icu' - +__channel__ = "cinemastreaming" +host = config.get_addon_version(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['openload', 'streamango'] From cb39735535d0da4cda9edbc31aa2cdab085a8fb9 Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 18:01:24 +0200 Subject: [PATCH 10/19] update all channel to retrive url by macro json --- channels.json | 23 +++++++++++++++++------ channels/altadefinizione01.py | 2 +- channels/animeleggendari.py | 2 +- channels/animespace.py | 2 +- channels/animesubita.py | 2 +- channels/animetubeita.py | 2 +- channels/animeworld.py | 2 +- channels/casacinema.py | 2 +- channels/casacinemaInfo.py | 2 +- channels/cb01anime.py | 2 +- channels/cinemalibero.py | 2 +- channels/cinemastreaming.py | 2 +- channels/documentaristreamingda.py | 4 ++-- channels/dreamsub.py | 4 ++-- channels/eurostreaming.py | 3 ++- channels/filmigratis.py | 6 ++---- channels/filmpertutti.py | 3 ++- channels/filmsenzalimiti.py | 3 +-- channels/filmsenzalimiticc.py | 3 +-- channels/guardarefilm.py | 3 ++- channels/guardaseriecc.py | 3 ++- channels/guardaserieclick.py | 2 +- channels/guardogratis.py | 3 +-- channels/ilgeniodellostreaming.py | 3 ++- channels/italiafilm.py | 4 ++-- channels/italiafilmhd.py | 4 ++-- channels/italiaserie.py | 4 ++-- channels/itastreaming.py | 4 ++-- channels/mondolunatico.py | 4 +--- channels/mondolunatico2.py | 4 ++-- channels/mondoserietv.py | 4 +++- channels/piratestreaming.py | 3 +-- channels/serietvonline.py | 3 ++- channels/serietvsubita.py | 2 +- channels/serietvu.py | 2 +- channels/streamingaltadefinizione.py | 3 ++- channels/streamking.py | 3 ++- channels/tantifilm.py | 3 ++- channels/toonitalia.py | 5 +++-- 39 files changed, 76 insertions(+), 61 deletions(-) diff --git a/channels.json b/channels.json index 4a172b0e..98d53014 100644 --- a/channels.json +++ b/channels.json @@ -19,36 +19,47 @@ "cineblog01": "https://cb01.tools", "cinemalibero": "https://cinemalibero.icu", "cinemastreaming": "https://cinemastreaming.icu", - "documentaristreamingdb": "https://documentari-streaming-da.com", - "downloadme": "https://www.downloadme.gratis", - "dragonballforever": "https://www.dragonballforever.it", + "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", + "italiafilmhd": "https://italiafilm.info", "italiafilmvedohd": "https://italiafilm.info", - "italiaserie_uno": "https:://italiaserie.org", + "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/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/animeleggendari.py b/channels/animeleggendari.py index 0a30683b..dfc9371e 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -13,7 +13,7 @@ from platformcode import logger, config from specials import autoplay, autorenumber __channel__ = "animeleggendari" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) # Richiesto per Autoplay IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/animespace.py b/channels/animespace.py index 5f57479e..9e6a6d5a 100644 --- a/channels/animespace.py +++ b/channels/animespace.py @@ -16,7 +16,7 @@ from specials import autoplay from specials import renumbertools __channel__ = "animespace" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) checklinks = config.get_setting('checklinks', 'animespace') checklinks_number = config.get_setting('checklinks_number', 'animespace') diff --git a/channels/animesubita.py b/channels/animesubita.py index 744d0365..80e4e08a 100644 --- a/channels/animesubita.py +++ b/channels/animesubita.py @@ -14,7 +14,7 @@ from core.item import Item from platformcode import logger, config __channel__ = "animesubita" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) PERPAGE = 20 # ---------------------------------------------------------------------------------------------------------------- diff --git a/channels/animetubeita.py b/channels/animetubeita.py index 55554e7e..d261c048 100644 --- a/channels/animetubeita.py +++ b/channels/animetubeita.py @@ -11,7 +11,7 @@ from core.item import Item from platformcode import logger, config __channel__ = "animetubeita" -host = config.get_addon_version(__channel__) +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 c1814d7e..aa8204e0 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -14,7 +14,7 @@ from platformcode import logger, config from specials import autoplay, autorenumber __channel__ = "animeworld" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) headers = [['Referer', host]] IDIOMAS = {'Italiano': 'Italiano'} diff --git a/channels/casacinema.py b/channels/casacinema.py index 54abcbf5..8758598a 100644 --- a/channels/casacinema.py +++ b/channels/casacinema.py @@ -13,7 +13,7 @@ from platformcode import logger, config from specials import autoplay __channel__ = "casacinema" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py index e9ee4a60..a853aa5e 100644 --- a/channels/casacinemaInfo.py +++ b/channels/casacinemaInfo.py @@ -9,7 +9,7 @@ from platformcode import logger, config from specials import autoplay __channel__ = "casacinemainfo" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] diff --git a/channels/cb01anime.py b/channels/cb01anime.py index b1a485f1..c818dcf3 100644 --- a/channels/cb01anime.py +++ b/channels/cb01anime.py @@ -11,7 +11,7 @@ from core.item import Item from platformcode import logger, config __channel__ = "cb01anime" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) #esclusione degli articoli 'di servizio' blacklist = ['AVVISO IMPORTANTE – CB01.ROCKS', 'Lista Alfabetica Completa Anime/Cartoon', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE'] diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index 7f60fcb8..f652a95c 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -23,7 +23,7 @@ checklinks = config.get_setting('checklinks', 'cinemalibero') checklinks_number = config.get_setting('checklinks_number', 'cinemalibero') __channel__ = "cinemalibero" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/cinemastreaming.py b/channels/cinemastreaming.py index 8f5df8d2..32bb622f 100644 --- a/channels/cinemastreaming.py +++ b/channels/cinemastreaming.py @@ -9,7 +9,7 @@ from core.item import Item from specials import autoplay __channel__ = "cinemastreaming" -host = config.get_addon_version(__channel__) +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['openload', 'streamango'] diff --git a/channels/documentaristreamingda.py b/channels/documentaristreamingda.py index bfed21b3..84fae55d 100644 --- a/channels/documentaristreamingda.py +++ b/channels/documentaristreamingda.py @@ -10,8 +10,8 @@ from core import httptools, scrapertools, servertools from core.item import Item from platformcode import logger, config -host = "https://documentari-streaming-da.com" - +__channel__ = "documentaristreamingda" +host = config.get_channel_url(__channel__) def mainlist(item): logger.info("kod.documentaristreamingda mainlist") diff --git a/channels/dreamsub.py b/channels/dreamsub.py index c5516fae..cd24e192 100644 --- a/channels/dreamsub.py +++ b/channels/dreamsub.py @@ -10,8 +10,8 @@ from core import scrapertools, httptools, servertools, tmdb from core.item import Item from platformcode import logger, config -host = "https://www.dreamsub.co" - +__channel__ = "dreamsub" +host = config.get_channel_url(__channel__) def mainlist(item): logger.info("kod.dreamsub mainlist") diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index 9969f7a2..afabfa3a 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -22,7 +22,8 @@ from core.item import Item from platformcode import logger, config from specials import autoplay -host = "https://eurostreaming.cafe/" +__channel__ = "eurostreaming" +host = config.get_channel_url(__channel__) headers = ['Referer', host] IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/filmigratis.py b/channels/filmigratis.py index e66076f9..fd557f7d 100644 --- a/channels/filmigratis.py +++ b/channels/filmigratis.py @@ -9,10 +9,8 @@ from core.item import Item from platformcode import logger, config from specials import autoplay -channel = 'filmigratis' - -host = 'https://filmigratis.net' - +__channel__ = 'filmigratis' +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['openload', 'streamango', 'vidoza', 'okru'] diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py index 7f7bc736..bf090b28 100644 --- a/channels/filmpertutti.py +++ b/channels/filmpertutti.py @@ -10,7 +10,8 @@ from core.item import Item from platformcode import config, logger from specials import autoplay -host = "https://www.filmpertutti.club" +__channel__ = 'filmpertutti' +host = config.get_channel_url(__channel__) headers = [['Referer', host]] list_servers = ['verystream', 'openload', 'streamango', 'wstream', 'akvideo'] list_quality = ['HD', 'SD'] diff --git a/channels/filmsenzalimiti.py b/channels/filmsenzalimiti.py index 5723a1cd..b303fa1d 100644 --- a/channels/filmsenzalimiti.py +++ b/channels/filmsenzalimiti.py @@ -11,8 +11,7 @@ from platformcode import logger from specials import autoplay __channel__ = 'filmsenzalimiti' - -host = 'https://filmsenzalimiti.space' +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py index 0d9e3b94..f4e25faf 100644 --- a/channels/filmsenzalimiticc.py +++ b/channels/filmsenzalimiticc.py @@ -15,6 +15,7 @@ from specials import autoplay # Necessario per Autoplay __channel__ = 'filmsenzalimiticc' +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() @@ -25,8 +26,6 @@ list_quality = ['default'] checklinks = config.get_setting('checklinks', 'filmsenzalimiticc') checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiticc') -host = 'https://filmsenzalimiti.pw' - headers = [['Referer', host]] diff --git a/channels/guardarefilm.py b/channels/guardarefilm.py index b3a5fb0d..3db3bee6 100644 --- a/channels/guardarefilm.py +++ b/channels/guardarefilm.py @@ -13,7 +13,8 @@ from core import servertools from core.item import Item from platformcode import logger, config -host = "https://www.guardarefilm.video" +__channel__ = 'guardarefilm' +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/guardaseriecc.py b/channels/guardaseriecc.py index 41fe6102..232f5a4e 100644 --- a/channels/guardaseriecc.py +++ b/channels/guardaseriecc.py @@ -12,7 +12,8 @@ from core.item import Item from lib import unshortenit from platformcode import logger, config -host = 'https://guardaserie.site' +__channel__ = 'guardaseriecc' +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py index af3eaf8f..e6ad4ef9 100644 --- a/channels/guardaserieclick.py +++ b/channels/guardaserieclick.py @@ -13,7 +13,7 @@ from core.support import log from platformcode import logger, config __channel__ = 'guardaserieclick' -host = config.get_setting("channel_host", __channel__) +host = config.get_channel_url(__channel__) headers = [['Referer', host]] IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/guardogratis.py b/channels/guardogratis.py index 03583c41..5a0a68b9 100644 --- a/channels/guardogratis.py +++ b/channels/guardogratis.py @@ -16,8 +16,7 @@ from core.item import Item from platformcode import logger, config __channel__ = "guardogratis" - -host = "https://guardogratis.it/" +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py index 41befd74..378b1b9d 100644 --- a/channels/ilgeniodellostreaming.py +++ b/channels/ilgeniodellostreaming.py @@ -10,7 +10,8 @@ from core import scrapertoolsV2, httptools, tmdb, support from core.support import log, menu, aplay from core.item import Item -host = "https://ilgeniodellostreaming.pw" +__channel__ = 'ilgeniodellostreaming' +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() diff --git a/channels/italiafilm.py b/channels/italiafilm.py index fa437435..d763bd32 100644 --- a/channels/italiafilm.py +++ b/channels/italiafilm.py @@ -14,8 +14,8 @@ from core import tmdb from core.item import Item from platformcode import logger, config -host = "https://www.italia-film.pro" - +__channel__ = 'italiafilm' +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/italiafilmhd.py b/channels/italiafilmhd.py index 0aeeb189..67196dc7 100644 --- a/channels/italiafilmhd.py +++ b/channels/italiafilmhd.py @@ -20,8 +20,8 @@ list_quality = ['default'] checklinks = config.get_setting('checklinks', 'italiafilmhd') checklinks_number = config.get_setting('checklinks_number', 'italiafilmhd') -host = "https://italiafilm.network" - +__channel__ = 'italiafilmhd' +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/italiaserie.py b/channels/italiaserie.py index 0c1e46bf..5da587c3 100644 --- a/channels/italiaserie.py +++ b/channels/italiaserie.py @@ -12,8 +12,8 @@ from core import tmdb from core.item import Item from platformcode import logger -host = "https://italiaserie.org" - +__channel__ = 'italiaserie' +host = config.get_channel_url(__channel__) list_servers = ['speedvideo'] IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/itastreaming.py b/channels/itastreaming.py index 9c9cf2e4..09802a29 100644 --- a/channels/itastreaming.py +++ b/channels/itastreaming.py @@ -9,8 +9,8 @@ from core import scrapertools, httptools, tmdb, support from core.item import Item from platformcode import logger, config -host = "https://itastreaming.film" - +__channel__ = 'itastreaming' +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/mondolunatico.py b/channels/mondolunatico.py index 864cc419..c6b1d485 100644 --- a/channels/mondolunatico.py +++ b/channels/mondolunatico.py @@ -19,9 +19,7 @@ from platformcode import config from platformcode import logger __channel__ = "mondolunatico" - -host = "http://mondolunatico.org" - +host = config.get_channel_url(__channel__) captcha_url = '%s/pass/CaptchaSecurityImages.php?width=100&height=40&characters=5' % host PERPAGE = 25 diff --git a/channels/mondolunatico2.py b/channels/mondolunatico2.py index 8de1db93..d08863a0 100644 --- a/channels/mondolunatico2.py +++ b/channels/mondolunatico2.py @@ -15,8 +15,8 @@ from core import scrapertools, httptools, tmdb, servertools, support, scrapertoo from core.item import Item from platformcode import logger, config, platformtools -channel = "mondolunatico2" -host = "https://mondolunatico.org/stream/" +__channel__ = "mondolunatico2" +host = config.get_channel_url(__channel__) headers = [['Referer', host]] list_servers = ['verystream', 'wstream', 'openload', 'streamango'] diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py index 7ca2e916..a1e5d943 100644 --- a/channels/mondoserietv.py +++ b/channels/mondoserietv.py @@ -13,7 +13,9 @@ from lib.unshortenit import unshorten from platformcode import logger, config from specials import autoplay -host = "https://mondoserietv.com" +__channel__ = "mondoserietv" +host = config.get_channel_url(__channel__) + IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() list_servers = ['akstream'] diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py index f00b0b9d..f81bbc41 100644 --- a/channels/piratestreaming.py +++ b/channels/piratestreaming.py @@ -15,8 +15,7 @@ from platformcode import logger, config from specials import autoplay __channel__ = "piratestreaming" - -host = "http://www.piratestreaming.watch" +host = config.get_channel_url(__channel__) IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() diff --git a/channels/serietvonline.py b/channels/serietvonline.py index 120e4152..f0c06b1c 100644 --- a/channels/serietvonline.py +++ b/channels/serietvonline.py @@ -11,7 +11,8 @@ from lib import unshortenit from platformcode import logger, config from specials import autoplay -host = "https://serietvonline.live" +__channel__ = "serietvonline" +host = config.get_channel_url(__channel__) headers = [['Referer', host]] IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py index 693e7487..b84ef25f 100644 --- a/channels/serietvsubita.py +++ b/channels/serietvsubita.py @@ -13,7 +13,7 @@ from core.support import log from platformcode import logger, config __channel__ = "serietvsubita" -host = config.get_setting("channel_host", __channel__) +host = config.get_channel_url(__channel__) headers = [['Referer', host]] IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/serietvu.py b/channels/serietvu.py index 8280e6f8..0a9bbc2d 100644 --- a/channels/serietvu.py +++ b/channels/serietvu.py @@ -11,7 +11,7 @@ from core.support import log from platformcode import logger, config __channel__ = 'serietvu' -host = config.get_setting("channel_host", __channel__) +host = config.get_channel_url(__channel__) headers = [['Referer', host]] IDIOMAS = {'Italiano': 'IT'} diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py index 8dceedac..f87a1fd8 100644 --- a/channels/streamingaltadefinizione.py +++ b/channels/streamingaltadefinizione.py @@ -7,7 +7,8 @@ from core import support from core.item import Item from specials import autoplay -host = 'https://www.streamingaltadefinizione.space' +__channel__ = "streamingaltadefinizione" +host = config.get_channel_url(__channel__) list_servers = ['verystream', 'openload', 'wstream'] list_quality = ['1080p', 'HD', 'DVDRIP', 'SD', 'CAM'] diff --git a/channels/streamking.py b/channels/streamking.py index 71aecbfe..7a987fce 100644 --- a/channels/streamking.py +++ b/channels/streamking.py @@ -11,7 +11,8 @@ from core import scrapertools, httptools from core.item import Item from platformcode import logger -host = "http://streamking.cc" +__channel__ = "streamking" +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/tantifilm.py b/channels/tantifilm.py index 0b33787a..666a3b34 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -18,7 +18,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'streamango', 'vidlox', 'youtube'] list_quality = ['default'] -host = "https://www.tantifilm.cafe" +__channel__ = "tantifilm" +host = config.get_channel_url(__channel__) headers = [['Referer', host]] diff --git a/channels/toonitalia.py b/channels/toonitalia.py index 9b2eff48..61c71c81 100644 --- a/channels/toonitalia.py +++ b/channels/toonitalia.py @@ -11,8 +11,9 @@ from core.item import Item from platformcode import logger from specials import autoplay -channel = "toonitalia" -host = "https://toonitalia.org" +__channel__ = "toonitalia" +host = config.get_channel_url(__channel__) + headers = [['Referer', host]] list_servers = ['wstream', 'openload', 'streamango'] From ed42c22f09da4cfcac8f68c16b9b151559c0175b Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 18:07:31 +0200 Subject: [PATCH 11/19] + [EXPERIMENTAL] function to choose if using custom or not urls channel --- platformcode/config.py | 31 +++++++++++++++------------ resources/language/English/strings.po | 4 ++++ resources/language/Italian/strings.po | 6 +++++- resources/settings.xml | 1 + 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/platformcode/config.py b/platformcode/config.py index 9adcddd2..10a6e8d4 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -83,21 +83,24 @@ def get_videolibrary_support(): return True def get_channel_url(name): - try: - try: - import json - except: - import simplejson as json - ROOT_DIR = xbmc.translatePath(__settings__.getAddonInfo('Path')) - LOCAL_FILE = os.path.join(ROOT_DIR, "channels.json") - with open(LOCAL_FILE) as f: - data = json.load(f) - if data[name] is not None: - return data[name] - else: - return get_setting("channel_host", name) - except: + if __settings__.getSetting("use_custom_url"): return get_setting("channel_host", name) + else: + try: + try: + import json + except: + import simplejson as json + ROOT_DIR = xbmc.translatePath(__settings__.getAddonInfo('Path')) + LOCAL_FILE = os.path.join(ROOT_DIR, "channels.json") + with open(LOCAL_FILE) as f: + data = json.load(f) + if data[name] is not None: + return data[name] + else: + return get_setting("channel_host", name) + except: + return get_setting("channel_host", name) def get_system_platform(): """ fonction: pour recuperer la platform que xbmc tourne """ diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 7886c8c6..ac92b2ff 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -5514,4 +5514,8 @@ msgstr "" msgctxt "#70704" msgid "TMDB ID (0 to cancel)" +msgstr "" + +msgctxt "#70705" +msgid "Use your custom channel URLs" msgstr "" \ No newline at end of file diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index 08f4c07c..cac29cd2 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5514,4 +5514,8 @@ msgstr "Crea cartelle con le lettere minuscole" msgctxt "#70704" msgid "TMDB ID (0 to cancel)" -msgstr "TMDB ID (0 per annullare)" \ No newline at end of file +msgstr "TMDB ID (0 per annullare)" + +msgctxt "#70705" +msgid "Use your custom channel URLs" +msgstr "Utilizza URL personalizzati per i canali" \ No newline at end of file diff --git a/resources/settings.xml b/resources/settings.xml index 3651121a..2ea2da53 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -10,6 +10,7 @@ + From 5c7c21576c80e8ab3e4d1e59f5fd152460362f49 Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 18:15:49 +0200 Subject: [PATCH 12/19] missing https in speedvideo --- servers/speedvideo.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/servers/speedvideo.json b/servers/speedvideo.json index da4c68db..4e6a0772 100644 --- a/servers/speedvideo.json +++ b/servers/speedvideo.json @@ -6,6 +6,10 @@ { "pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)", "url": "http://speedvideo.net/embed-\\1.html" + }, + { + "pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)", + "url": "https://speedvideo.net/embed-\\1.html" } ] }, From da2c4edcd62472d20bc5a5cd1e3cc44a412f4692 Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 18:21:39 +0200 Subject: [PATCH 13/19] missing == "true" i can't even code seriously --- platformcode/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformcode/config.py b/platformcode/config.py index 10a6e8d4..9db1c509 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -83,7 +83,7 @@ def get_videolibrary_support(): return True def get_channel_url(name): - if __settings__.getSetting("use_custom_url"): + if __settings__.getSetting("use_custom_url") == "true": return get_setting("channel_host", name) else: try: From 33f70c3bc807bbd6ac9158d38c4e46b3af16accb Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 18:57:31 +0200 Subject: [PATCH 14/19] autoset url channels --- platformcode/config.py | 2 ++ videolibrary_service.py | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/platformcode/config.py b/platformcode/config.py index 9db1c509..fa40f764 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -14,6 +14,8 @@ PLUGIN_NAME = "kod" __settings__ = xbmcaddon.Addon(id="plugin.video." + PLUGIN_NAME) __language__ = __settings__.getLocalizedString +def get_addon_core(): + return __settings__ def get_addon_version(with_fix=True): ''' diff --git a/videolibrary_service.py b/videolibrary_service.py index 18f64e10..568022d0 100644 --- a/videolibrary_service.py +++ b/videolibrary_service.py @@ -310,14 +310,30 @@ def monitor_update(): check_for_update(overwrite=False) def get_channel_json(): - import urllib, os, xbmc, xbmcaddon - addon = xbmcaddon.Addon('plugin.video.kod') - ROOT_DIR = xbmc.translatePath(addon.getAddonInfo('Path')) + import urllib, os, xbmc + addon = config.get_addon_core() + ROOT_DIR = config.get_runtime_path() LOCAL_FILE = os.path.join(ROOT_DIR, "channels.json") if os.path.exists(LOCAL_FILE): os.remove(LOCAL_FILE) urllib.urlretrieve("https://raw.githubusercontent.com/kodiondemand/addon/master/channels.json", LOCAL_FILE) + + if addon.getSetting("use_custom_url") != "true": + channels_path = os.path.join(ROOT_DIR, "channels", '*.json') + channel_files = sorted(glob.glob(channels_path), key=lambda x: os.path.basename(x)) + for channel_file in channel_files: + if 1: + try: + import json + except: + import simplejson as json + with open(LOCAL_FILE) as f: + data = json.load(f) + if data[channel_file] is not None: + config.set_setting(name=data[channel_file], value="value", channel=channel_file) + else: + pass if __name__ == "__main__": # Se ejecuta en cada inicio From 56aab05ae3fdd016c53a980dadd09a72360d46e0 Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 19:09:56 +0200 Subject: [PATCH 15/19] autoset json url with a very unundestrandable code --- videolibrary_service.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/videolibrary_service.py b/videolibrary_service.py index 568022d0..03b56047 100644 --- a/videolibrary_service.py +++ b/videolibrary_service.py @@ -3,7 +3,7 @@ # Service for updating new episodes on library series # ------------------------------------------------------------ -import datetime, imp, math, threading, traceback, sys +import datetime, imp, math, threading, traceback, sys, glob @@ -323,17 +323,15 @@ def get_channel_json(): channels_path = os.path.join(ROOT_DIR, "channels", '*.json') channel_files = sorted(glob.glob(channels_path), key=lambda x: os.path.basename(x)) for channel_file in channel_files: - if 1: - try: - import json - except: - import simplejson as json + if channel_file: + try: import json + except: import simplejson as json with open(LOCAL_FILE) as f: data = json.load(f) - if data[channel_file] is not None: - config.set_setting(name=data[channel_file], value="value", channel=channel_file) - else: - pass + try: + if data[channel_file]: + config.set_setting(name=data[channel_file], value="value", channel=channel_file) + except: pass #channel not in json if __name__ == "__main__": # Se ejecuta en cada inicio From c8b55e7ab050db7983ea18e3d23160d118430cfa Mon Sep 17 00:00:00 2001 From: cttynul Date: Thu, 6 Jun 2019 19:27:23 +0200 Subject: [PATCH 16/19] missing import --- channels/LIKUOO.py | 1 + channels/TXXX.py | 1 + channels/absoluporn.py | 1 + channels/alsoporn.py | 1 + channels/analdin.py | 1 + channels/bleachportal.py | 1 + channels/bravoporn.py | 1 + channels/camwhoresbay.py | 1 + channels/canalporno.py | 1 + channels/cinemastreaming.py | 1 + channels/cliphunter.py | 1 + channels/coomelonitas.py | 1 + channels/czechvideo.py | 1 + channels/datoporn.py | 1 + channels/elreyx.py | 1 + channels/eporner.py | 1 + channels/eroticage.py | 1 + channels/eroticasonlinetv.py | 1 + channels/erotik.py | 1 + channels/fapality.py | 1 + channels/fetishshrine.py | 1 + channels/filmoviXXX.py | 1 + channels/filmpornoita.py | 1 + channels/foxtube.py | 1 + channels/freeporn.py | 1 + channels/freepornstreams.py | 1 + channels/hclips.py | 1 + channels/hdblog.py | 1 + channels/hdzog.py | 1 + channels/hellporno.py | 1 + channels/hentaiid.py | 1 + channels/hotmovs.py | 1 + channels/ilgeniodellostreaming.py | 1 + channels/ilgiramondo.py | 1 + channels/italiaserie.py | 1 + channels/javlin.py | 1 + channels/javus.py | 1 + channels/javwhores.py | 1 + channels/jizzbunker.py | 1 + channels/justporn.py | 1 + channels/mporno.py | 1 + channels/muchoporno.py | 1 + channels/nuvid.py | 1 + channels/pandamovie.py | 1 + channels/peliculaseroticas.py | 1 + channels/pelisxporno.py | 1 + channels/perfectgirls.py | 1 + channels/playpornx.py | 1 + channels/porn300.py | 1 + channels/pornboss.py | 1 + channels/porneq.py | 1 + channels/pornhive.py | 1 + channels/pornhub.py | 1 + channels/pornrewind.py | 1 + channels/porntrex.py | 1 + channels/programmazione.py | 1 + channels/qwertty.py | 1 + channels/redtube.py | 1 + channels/ricettevideo.py | 1 + channels/serviporno.py | 1 + channels/sexgalaxy.py | 1 + channels/sexkino.py | 1 + channels/sexofilm.py | 1 + channels/siska.py | 1 + channels/spankbang.py | 1 + channels/spankwire.py | 1 + channels/streamingaltadefinizione.py | 1 + channels/streamingporn.py | 1 + channels/streamking.py | 1 + channels/streamporno.py | 1 + channels/submityouflicks.py | 1 + channels/sunporno.py | 1 + channels/tabooshare.py | 1 + channels/tantifilm.py | 1 + channels/tnaflix.py | 1 + channels/toonitalia.py | 1 + channels/tryboobs.py | 1 + channels/tubedupe.py | 1 + channels/tubehentai.py | 1 + channels/vedohd.py | 1 + channels/videosXYZ.py | 1 + channels/vidz7.py | 1 + channels/vintagetube.py | 1 + channels/vintagexxxsex.py | 1 + channels/vporn.py | 1 + channels/watchpornfree.py | 1 + channels/webpeliculasporno.py | 1 + channels/woodrocket.py | 1 + channels/x18hentai.py | 1 + channels/xhamster.py | 1 + channels/xozilla.py | 1 + channels/xtapes.py | 1 + channels/xxxdan.py | 1 + channels/xxxfreeinhd.py | 1 + channels/xxxparodyhd.py | 1 + channels/xxxstreams.py | 1 + channels/yespornplease.py | 1 + channels/youjizz.py | 1 + channels/youporn.py | 1 + channels/youtube_channel.py | 1 + channels/yuuk.py | 1 + 101 files changed, 101 insertions(+) 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/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/bleachportal.py b/channels/bleachportal.py index f06aa116..3df421a0 100644 --- a/channels/bleachportal.py +++ b/channels/bleachportal.py @@ -10,6 +10,7 @@ import re from core import scrapertools, httptools from core.item import Item from platformcode import logger +from platformcode import config host = "http://www.bleachportal.it" diff --git a/channels/bravoporn.py b/channels/bravoporn.py index c3521363..b8c52c35 100644 --- a/channels/bravoporn.py +++ b/channels/bravoporn.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.bravoporn.com' diff --git a/channels/camwhoresbay.py b/channels/camwhoresbay.py index a55af776..330edb20 100644 --- a/channels/camwhoresbay.py +++ b/channels/camwhoresbay.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.camwhoresbay.com' diff --git a/channels/canalporno.py b/channels/canalporno.py index 9d9f9d4a..01a8dcf9 100644 --- a/channels/canalporno.py +++ b/channels/canalporno.py @@ -3,6 +3,7 @@ from core import httptools from core import scrapertools from platformcode import logger +from platformcode import config host = "http://www.canalporno.com" diff --git a/channels/cinemastreaming.py b/channels/cinemastreaming.py index 32bb622f..ae7c72ef 100644 --- a/channels/cinemastreaming.py +++ b/channels/cinemastreaming.py @@ -7,6 +7,7 @@ import re from core import scrapertools, httptools, scrapertoolsV2, support from core.item import Item from specials import autoplay +from platformcode import config __channel__ = "cinemastreaming" host = config.get_channel_url(__channel__) diff --git a/channels/cliphunter.py b/channels/cliphunter.py index cf044a34..7ba4ad64 100644 --- a/channels/cliphunter.py +++ b/channels/cliphunter.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.cliphunter.com' diff --git a/channels/coomelonitas.py b/channels/coomelonitas.py index 05d9164e..5d44526a 100644 --- a/channels/coomelonitas.py +++ b/channels/coomelonitas.py @@ -6,6 +6,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.coomelonitas.com' diff --git a/channels/czechvideo.py b/channels/czechvideo.py index 3dd4bbb8..a750ede4 100644 --- a/channels/czechvideo.py +++ b/channels/czechvideo.py @@ -9,6 +9,7 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://czechvideo.org' diff --git a/channels/datoporn.py b/channels/datoporn.py index c5d2bfec..507efb1d 100644 --- a/channels/datoporn.py +++ b/channels/datoporn.py @@ -5,6 +5,7 @@ import re from core import httptools from core import scrapertools from platformcode import logger +from platformcode import config def mainlist(item): diff --git a/channels/elreyx.py b/channels/elreyx.py index 33f78914..8f6a20a7 100644 --- a/channels/elreyx.py +++ b/channels/elreyx.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.elreyx.com' diff --git a/channels/eporner.py b/channels/eporner.py index 7cb78df8..00b0e4b2 100644 --- a/channels/eporner.py +++ b/channels/eporner.py @@ -7,6 +7,7 @@ import urlparse from core import httptools from core import jsontools from platformcode import logger +from platformcode import config def mainlist(item): diff --git a/channels/eroticage.py b/channels/eroticage.py index eb42dd31..568b39a0 100644 --- a/channels/eroticage.py +++ b/channels/eroticage.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.eroticage.net' diff --git a/channels/eroticasonlinetv.py b/channels/eroticasonlinetv.py index 6f6c6017..b3d7f3d6 100644 --- a/channels/eroticasonlinetv.py +++ b/channels/eroticasonlinetv.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.peliculaseroticasonline.tv' diff --git a/channels/erotik.py b/channels/erotik.py index fb8168f1..f39befd7 100644 --- a/channels/erotik.py +++ b/channels/erotik.py @@ -9,6 +9,7 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger +from platformcode import config host = "https://www.youfreeporntube.net" diff --git a/channels/fapality.py b/channels/fapality.py index 780f9796..20c77965 100644 --- a/channels/fapality.py +++ b/channels/fapality.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://fapality.com' diff --git a/channels/fetishshrine.py b/channels/fetishshrine.py index ddd0ac14..52168aae 100644 --- a/channels/fetishshrine.py +++ b/channels/fetishshrine.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.fetishshrine.com' diff --git a/channels/filmoviXXX.py b/channels/filmoviXXX.py index b378e4d5..5669cfbe 100644 --- a/channels/filmoviXXX.py +++ b/channels/filmoviXXX.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 # BLOQUEO ESET INTERNET SECURITY diff --git a/channels/filmpornoita.py b/channels/filmpornoita.py index 880f1e1d..30171546 100644 --- a/channels/filmpornoita.py +++ b/channels/filmpornoita.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.streamxxxx.com' diff --git a/channels/foxtube.py b/channels/foxtube.py index 4b45a898..e8ab9c34 100644 --- a/channels/foxtube.py +++ b/channels/foxtube.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://es.foxtube.com' diff --git a/channels/freeporn.py b/channels/freeporn.py index 3103651f..69e1f65d 100644 --- a/channels/freeporn.py +++ b/channels/freeporn.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://frprn.com' diff --git a/channels/freepornstreams.py b/channels/freepornstreams.py index c436dec8..adc9881f 100644 --- a/channels/freepornstreams.py +++ b/channels/freepornstreams.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://freepornstreams.org' diff --git a/channels/hclips.py b/channels/hclips.py index 785ba47e..eda1f2dc 100644 --- a/channels/hclips.py +++ b/channels/hclips.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.hclips.com' diff --git a/channels/hdblog.py b/channels/hdblog.py index 805e3d84..c52e4266 100644 --- a/channels/hdblog.py +++ b/channels/hdblog.py @@ -9,6 +9,7 @@ import urlparse from core import httptools, scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = "https://www.hdblog.it" diff --git a/channels/hdzog.py b/channels/hdzog.py index 7fb08179..9418454b 100644 --- a/channels/hdzog.py +++ b/channels/hdzog.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.hdzog.com' diff --git a/channels/hellporno.py b/channels/hellporno.py index e6407aa0..cfff8d1c 100644 --- a/channels/hellporno.py +++ b/channels/hellporno.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://hellporno.com' diff --git a/channels/hentaiid.py b/channels/hentaiid.py index f1c69f7b..da7240b8 100644 --- a/channels/hentaiid.py +++ b/channels/hentaiid.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 CHANNEL_HOST = "http://hentai-id.tv/" diff --git a/channels/hotmovs.py b/channels/hotmovs.py index 78ebcb6a..55a7f1ec 100644 --- a/channels/hotmovs.py +++ b/channels/hotmovs.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 = 'https://hotmovs.com' diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py index 378b1b9d..972a7c0b 100644 --- a/channels/ilgeniodellostreaming.py +++ b/channels/ilgeniodellostreaming.py @@ -9,6 +9,7 @@ from platformcode import logger from core import scrapertoolsV2, httptools, tmdb, support from core.support import log, menu, aplay from core.item import Item +from platformcode import config __channel__ = 'ilgeniodellostreaming' host = config.get_channel_url(__channel__) diff --git a/channels/ilgiramondo.py b/channels/ilgiramondo.py index e6b9116d..147c8d42 100644 --- a/channels/ilgiramondo.py +++ b/channels/ilgiramondo.py @@ -9,6 +9,7 @@ import urlparse from core import httptools, scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = "http://www.ilgiramondo.net" diff --git a/channels/italiaserie.py b/channels/italiaserie.py index 5da587c3..98dc22de 100644 --- a/channels/italiaserie.py +++ b/channels/italiaserie.py @@ -11,6 +11,7 @@ from core import httptools, scrapertools from core import tmdb from core.item import Item from platformcode import logger +from platformcode import config __channel__ = 'italiaserie' host = config.get_channel_url(__channel__) diff --git a/channels/javlin.py b/channels/javlin.py index 39d12d60..6ab1d1f7 100644 --- a/channels/javlin.py +++ b/channels/javlin.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://javl.in' diff --git a/channels/javus.py b/channels/javus.py index 83979eb7..df1b7e82 100644 --- a/channels/javus.py +++ b/channels/javus.py @@ -6,6 +6,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://javus.net/' diff --git a/channels/javwhores.py b/channels/javwhores.py index 26105d9f..c974c92b 100644 --- a/channels/javwhores.py +++ b/channels/javwhores.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.javwhores.com/' diff --git a/channels/jizzbunker.py b/channels/jizzbunker.py index 4e148b76..c453be1d 100644 --- a/channels/jizzbunker.py +++ b/channels/jizzbunker.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://jizzbunker.com/es' diff --git a/channels/justporn.py b/channels/justporn.py index e44e5388..912ab1bb 100644 --- a/channels/justporn.py +++ b/channels/justporn.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://xxx.justporno.tv' diff --git a/channels/mporno.py b/channels/mporno.py index a9501fa5..1071c972 100644 --- a/channels/mporno.py +++ b/channels/mporno.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://mporno.tv' diff --git a/channels/muchoporno.py b/channels/muchoporno.py index 7841a745..9af38852 100644 --- a/channels/muchoporno.py +++ b/channels/muchoporno.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.pornburst.xxx' diff --git a/channels/nuvid.py b/channels/nuvid.py index 36c0d630..4f6a64c6 100644 --- a/channels/nuvid.py +++ b/channels/nuvid.py @@ -8,6 +8,7 @@ import urlparse from core import httptools from core import scrapertools from platformcode import logger +from platformcode import config host = "https://www.nuvid.com" diff --git a/channels/pandamovie.py b/channels/pandamovie.py index febd0f7a..7680ad63 100644 --- a/channels/pandamovie.py +++ b/channels/pandamovie.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 = 'https://pandamovies.pw' diff --git a/channels/peliculaseroticas.py b/channels/peliculaseroticas.py index 07557dc8..300cb786 100644 --- a/channels/peliculaseroticas.py +++ b/channels/peliculaseroticas.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 def mainlist(item): diff --git a/channels/pelisxporno.py b/channels/pelisxporno.py index ccea98ed..fcebb93d 100644 --- a/channels/pelisxporno.py +++ b/channels/pelisxporno.py @@ -3,6 +3,7 @@ from core import httptools from core import scrapertools from platformcode import logger +from platformcode import config def mainlist(item): diff --git a/channels/perfectgirls.py b/channels/perfectgirls.py index bd9ab819..b77d35e0 100644 --- a/channels/perfectgirls.py +++ b/channels/perfectgirls.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.perfectgirls.net' diff --git a/channels/playpornx.py b/channels/playpornx.py index a95d2d77..54a45d57 100644 --- a/channels/playpornx.py +++ b/channels/playpornx.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 = "https://watchfreexxx.net/" diff --git a/channels/porn300.py b/channels/porn300.py index e68dbc69..b222d71a 100644 --- a/channels/porn300.py +++ b/channels/porn300.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.porn300.com' diff --git a/channels/pornboss.py b/channels/pornboss.py index 3a8f00b2..c2ff0e62 100644 --- a/channels/pornboss.py +++ b/channels/pornboss.py @@ -7,6 +7,7 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://pornboss.org' diff --git a/channels/porneq.py b/channels/porneq.py index e7ecd0dc..5b4bee8a 100644 --- a/channels/porneq.py +++ b/channels/porneq.py @@ -6,6 +6,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://porneq.com' diff --git a/channels/pornhive.py b/channels/pornhive.py index 42c23f84..5df6411b 100644 --- a/channels/pornhive.py +++ b/channels/pornhive.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.pornhive.tv/en' diff --git a/channels/pornhub.py b/channels/pornhub.py index 55fafe6c..5c1fe01e 100644 --- a/channels/pornhub.py +++ b/channels/pornhub.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 def mainlist(item): diff --git a/channels/pornrewind.py b/channels/pornrewind.py index 918bead8..6dfde368 100644 --- a/channels/pornrewind.py +++ b/channels/pornrewind.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.pornrewind.com' diff --git a/channels/porntrex.py b/channels/porntrex.py index e11ac968..22d99f01 100644 --- a/channels/porntrex.py +++ b/channels/porntrex.py @@ -9,6 +9,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import config, logger +from platformcode import config host = "https://www.porntrex.com" perpage = 20 diff --git a/channels/programmazione.py b/channels/programmazione.py index 7ad79e71..15aa160d 100644 --- a/channels/programmazione.py +++ b/channels/programmazione.py @@ -10,6 +10,7 @@ import re from core import httptools, scrapertools from core.item import Item from platformcode import logger +from platformcode import config site = "https://www.youtube.com" diff --git a/channels/qwertty.py b/channels/qwertty.py index bfcfef78..73f2d01c 100644 --- a/channels/qwertty.py +++ b/channels/qwertty.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://qwertty.net' diff --git a/channels/redtube.py b/channels/redtube.py index c6ad55aa..faeaad1a 100644 --- a/channels/redtube.py +++ b/channels/redtube.py @@ -9,6 +9,7 @@ from core import httptools from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = 'https://es.redtube.com' diff --git a/channels/ricettevideo.py b/channels/ricettevideo.py index f304eef1..26374b3e 100644 --- a/channels/ricettevideo.py +++ b/channels/ricettevideo.py @@ -9,6 +9,7 @@ import urlparse from core import httptools, scrapertools from core.item import Item from platformcode import logger +from platformcode import config host = "http://ricettevideo.net" diff --git a/channels/serviporno.py b/channels/serviporno.py index 704b1496..773d51cc 100644 --- a/channels/serviporno.py +++ b/channels/serviporno.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 = "https://www.serviporno.com" diff --git a/channels/sexgalaxy.py b/channels/sexgalaxy.py index 9cc93f00..0228b622 100644 --- a/channels/sexgalaxy.py +++ b/channels/sexgalaxy.py @@ -9,6 +9,7 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://sexgalaxy.net' diff --git a/channels/sexkino.py b/channels/sexkino.py index 8eb31482..0aca2759 100644 --- a/channels/sexkino.py +++ b/channels/sexkino.py @@ -9,6 +9,7 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://sexkino.to' diff --git a/channels/sexofilm.py b/channels/sexofilm.py index 1d7012dd..8a1eb01f 100644 --- a/channels/sexofilm.py +++ b/channels/sexofilm.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://sexofilm.com' diff --git a/channels/siska.py b/channels/siska.py index 4fce0a75..92001dd9 100644 --- a/channels/siska.py +++ b/channels/siska.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.siska.tv/' diff --git a/channels/spankbang.py b/channels/spankbang.py index f6c25fcf..30834ae0 100644 --- a/channels/spankbang.py +++ b/channels/spankbang.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://es.spankbang.com' diff --git a/channels/spankwire.py b/channels/spankwire.py index 38522cd6..67a60e86 100644 --- a/channels/spankwire.py +++ b/channels/spankwire.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.spankwire.com' diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py index f87a1fd8..0406e670 100644 --- a/channels/streamingaltadefinizione.py +++ b/channels/streamingaltadefinizione.py @@ -6,6 +6,7 @@ from core import support from core.item import Item from specials import autoplay +from platformcode import config __channel__ = "streamingaltadefinizione" host = config.get_channel_url(__channel__) diff --git a/channels/streamingporn.py b/channels/streamingporn.py index 15357d7f..1c08ca6d 100644 --- a/channels/streamingporn.py +++ b/channels/streamingporn.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://streamingporn.xyz' diff --git a/channels/streamking.py b/channels/streamking.py index 7a987fce..729ad9d9 100644 --- a/channels/streamking.py +++ b/channels/streamking.py @@ -10,6 +10,7 @@ import urllib from core import scrapertools, httptools from core.item import Item from platformcode import logger +from platformcode import config __channel__ = "streamking" host = config.get_channel_url(__channel__) diff --git a/channels/streamporno.py b/channels/streamporno.py index 1625ee2e..853b5d9c 100644 --- a/channels/streamporno.py +++ b/channels/streamporno.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://streamporno.eu' diff --git a/channels/submityouflicks.py b/channels/submityouflicks.py index 4d013109..d4fc0723 100644 --- a/channels/submityouflicks.py +++ b/channels/submityouflicks.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.submityourflicks.com' diff --git a/channels/sunporno.py b/channels/sunporno.py index 65438323..2909bd65 100644 --- a/channels/sunporno.py +++ b/channels/sunporno.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.sunporno.com' diff --git a/channels/tabooshare.py b/channels/tabooshare.py index 0ce7976d..e2bdd1c7 100644 --- a/channels/tabooshare.py +++ b/channels/tabooshare.py @@ -7,6 +7,7 @@ from core import scrapertools from core import servertools from core.item import Item from platformcode import logger +from platformcode import config host = 'http://tabooshare.com' diff --git a/channels/tantifilm.py b/channels/tantifilm.py index 666a3b34..26aa66be 100644 --- a/channels/tantifilm.py +++ b/channels/tantifilm.py @@ -12,6 +12,7 @@ from core.item import Item from core.support import menu, log, aplay from platformcode import logger from specials import autorenumber +from platformcode import config IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() diff --git a/channels/tnaflix.py b/channels/tnaflix.py index 5ed50378..7734b23e 100644 --- a/channels/tnaflix.py +++ b/channels/tnaflix.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.tnaflix.com' diff --git a/channels/toonitalia.py b/channels/toonitalia.py index 61c71c81..a5f53497 100644 --- a/channels/toonitalia.py +++ b/channels/toonitalia.py @@ -10,6 +10,7 @@ from core import scrapertools, httptools, tmdb, support, servertools from core.item import Item from platformcode import logger from specials import autoplay +from platformcode import config __channel__ = "toonitalia" host = config.get_channel_url(__channel__) diff --git a/channels/tryboobs.py b/channels/tryboobs.py index 24d326e0..fa2108f2 100644 --- a/channels/tryboobs.py +++ b/channels/tryboobs.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.tryboobs.com' diff --git a/channels/tubedupe.py b/channels/tubedupe.py index c3fd7404..44d90216 100644 --- a/channels/tubedupe.py +++ b/channels/tubedupe.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://tubedupe.com' diff --git a/channels/tubehentai.py b/channels/tubehentai.py index baf45d1d..e2affd96 100644 --- a/channels/tubehentai.py +++ b/channels/tubehentai.py @@ -7,6 +7,7 @@ import urlparse from core import scrapertools from core.item import Item from platformcode import logger +from platformcode import config def mainlist(item): diff --git a/channels/vedohd.py b/channels/vedohd.py index 019fb71f..bb536728 100644 --- a/channels/vedohd.py +++ b/channels/vedohd.py @@ -7,6 +7,7 @@ from core import scrapertoolsV2, httptools, support from core.item import Item from platformcode import logger from specials import autoplay +from platformcode import config headers = "" host = "" diff --git a/channels/videosXYZ.py b/channels/videosXYZ.py index 6801942b..ba26f46b 100644 --- a/channels/videosXYZ.py +++ b/channels/videosXYZ.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://free-porn-videos.xyz' diff --git a/channels/vidz7.py b/channels/vidz7.py index 5621f1eb..5f3cbdbc 100644 --- a/channels/vidz7.py +++ b/channels/vidz7.py @@ -9,6 +9,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.vidz7.com' diff --git a/channels/vintagetube.py b/channels/vintagetube.py index 87ca480d..c3831dcd 100644 --- a/channels/vintagetube.py +++ b/channels/vintagetube.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.vintagetube.club' diff --git a/channels/vintagexxxsex.py b/channels/vintagexxxsex.py index 7c732c7a..d905d842 100644 --- a/channels/vintagexxxsex.py +++ b/channels/vintagexxxsex.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.vintagexxxsex.com' diff --git a/channels/vporn.py b/channels/vporn.py index 810b6414..25344cb9 100644 --- a/channels/vporn.py +++ b/channels/vporn.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.vporn.com' diff --git a/channels/watchpornfree.py b/channels/watchpornfree.py index 6760feb7..d2709d5f 100644 --- a/channels/watchpornfree.py +++ b/channels/watchpornfree.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 # https://playpornfree.org/ https://mangoporn.net/ https://watchfreexxx.net/ https://losporn.org/ https://xxxstreams.me/ https://speedporn.net/ diff --git a/channels/webpeliculasporno.py b/channels/webpeliculasporno.py index d9510a03..e49a51f6 100644 --- a/channels/webpeliculasporno.py +++ b/channels/webpeliculasporno.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.webpeliculasporno.com' diff --git a/channels/woodrocket.py b/channels/woodrocket.py index c4e1ec74..494c269a 100644 --- a/channels/woodrocket.py +++ b/channels/woodrocket.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://woodrocket.com' diff --git a/channels/x18hentai.py b/channels/x18hentai.py index 21c84558..f6aa698b 100644 --- a/channels/x18hentai.py +++ b/channels/x18hentai.py @@ -7,6 +7,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.18hentaionline.net/' headers = [['User-Agent', 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], diff --git a/channels/xhamster.py b/channels/xhamster.py index fb528002..564fb28f 100644 --- a/channels/xhamster.py +++ b/channels/xhamster.py @@ -7,6 +7,7 @@ import urlparse from core import scrapertools, httptools from core.item import Item from platformcode import logger +from platformcode import config HOST = "http://es.xhamster.com/" diff --git a/channels/xozilla.py b/channels/xozilla.py index e9ded5f6..566c8b43 100644 --- a/channels/xozilla.py +++ b/channels/xozilla.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 = 'https://www.xozilla.com' diff --git a/channels/xtapes.py b/channels/xtapes.py index 0ca05421..13c4f297 100644 --- a/channels/xtapes.py +++ b/channels/xtapes.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://hd.xtapes.to' diff --git a/channels/xxxdan.py b/channels/xxxdan.py index 6d369df1..f2359eb4 100644 --- a/channels/xxxdan.py +++ b/channels/xxxdan.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://xxxdan.com' diff --git a/channels/xxxfreeinhd.py b/channels/xxxfreeinhd.py index c5551afa..89637648 100644 --- a/channels/xxxfreeinhd.py +++ b/channels/xxxfreeinhd.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 = 'https://watchxxxfreeinhd.com' diff --git a/channels/xxxparodyhd.py b/channels/xxxparodyhd.py index 36695cc6..e3e04dd1 100644 --- a/channels/xxxparodyhd.py +++ b/channels/xxxparodyhd.py @@ -8,6 +8,7 @@ from core import scrapertools from core import tmdb from core.item import Item from platformcode import logger +from platformcode import config host = 'https://xxxparodyhd.net' diff --git a/channels/xxxstreams.py b/channels/xxxstreams.py index e8091c3c..2cb55ef4 100644 --- a/channels/xxxstreams.py +++ b/channels/xxxstreams.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://xxxstreams.org' diff --git a/channels/yespornplease.py b/channels/yespornplease.py index 89f48334..8e5abc28 100644 --- a/channels/yespornplease.py +++ b/channels/yespornplease.py @@ -7,6 +7,7 @@ from urlparse import urljoin from core import httptools from core import servertools from platformcode import logger +from platformcode import config HOST="http://yespornplease.com" diff --git a/channels/youjizz.py b/channels/youjizz.py index c7b799ae..54b310b0 100644 --- a/channels/youjizz.py +++ b/channels/youjizz.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 = 'https://www.youjizz.com' diff --git a/channels/youporn.py b/channels/youporn.py index 1f952da0..97e6b395 100644 --- a/channels/youporn.py +++ b/channels/youporn.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.youporn.com' diff --git a/channels/youtube_channel.py b/channels/youtube_channel.py index 343fd332..468fb554 100644 --- a/channels/youtube_channel.py +++ b/channels/youtube_channel.py @@ -5,6 +5,7 @@ import urllib from core import jsontools from core.item import Item from platformcode import logger +from platformcode import config CHANNELNAME = "youtube_channel" YOUTUBE_V3_API_KEY = "AIzaSyCjsmBT0JZy1RT-PLwB-Zkfba87sa2inyI" diff --git a/channels/yuuk.py b/channels/yuuk.py index 63d83ba7..a4adb269 100644 --- a/channels/yuuk.py +++ b/channels/yuuk.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://yuuk.net' From f1222d02323ed727513aac48b6ebbca8c8918caf Mon Sep 17 00:00:00 2001 From: greko <50103632+greko17@users.noreply.github.com> Date: Thu, 6 Jun 2019 22:32:50 +0200 Subject: [PATCH 17/19] eurostreaming e fix vari su altadefinizione01_L, fix wstream, add servers vari (#47) * eurostreaming by support e fix * fix wstream * aggiunto servers turbovid * server nowvideo * in channelselector aggiunta una voce e fix vari * fix support per episode * fix title2 cleahtml * fix per speedvideo * fix cinemalibero aggiunta configurazione canale per cambio host automatico * fix support item.language * migliorie codice server deltabit turbobit --- channels/altadefinizione01_link.json | 8 +- channels/altadefinizione01_link.py | 10 +- channels/cinemalibero.json | 8 ++ channels/cinemalibero.py | 13 ++- channels/eurostreaming.json | 53 ++-------- channels/eurostreaming.py | 149 +++++++++++++++------------ channelselector.py | 6 +- core/support.py | 24 +++-- servers/decrypters/zcrypt.py | 2 + servers/deltabit.py | 92 ++++++----------- servers/nowvideo.json | 75 ++++++++++++++ servers/nowvideo.py | 74 +++++++++++++ servers/speedvideo.json | 2 +- servers/speedvideo.py | 22 ++-- servers/turbovid.json | 42 ++++++++ servers/turbovid.py | 37 +++++++ servers/wstream.json | 8 +- 17 files changed, 421 insertions(+), 204 deletions(-) create mode 100644 servers/nowvideo.json create mode 100644 servers/nowvideo.py create mode 100644 servers/turbovid.json create mode 100644 servers/turbovid.py diff --git a/channels/altadefinizione01_link.json b/channels/altadefinizione01_link.json index a60ab421..579853b4 100644 --- a/channels/altadefinizione01_link.json +++ b/channels/altadefinizione01_link.json @@ -10,7 +10,8 @@ "fix" : "reimpostato url e modificato file per KOD", "change_date": "2019-30-04", "categories": [ - "movie" + "movie", + "vosi" ], "settings": [ { @@ -30,7 +31,7 @@ "visible": true }, { - "id": "include_in_newest_film", + "id": "include_in_newest_peliculas", "type": "bool", "label": "Includi in Novità", "default": true, @@ -79,7 +80,8 @@ "visible": true, "lvalues": [ "Non filtrare", - "IT" + "ITA", + "vosi" ] }, { diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py index a779c9bc..b46e87b6 100644 --- a/channels/altadefinizione01_link.py +++ b/channels/altadefinizione01_link.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # -*- Channel Altadefinizione01L Film - Serie -*- -# -*- Creato per Alfa-addon -*- -# -*- e adattato for KOD -*- # -*- By Greko -*- -# -*- last change: 26/05/2019 import channelselector from specials import autoplay @@ -18,10 +15,7 @@ __channel__ = "altadefinizione01_link" list_servers = ['supervideo', 'streamcherry','rapidvideo', 'streamango', 'openload'] list_quality = ['default'] -#host = config.get_setting("channel_host", __channel__) -host = config.get_channel_url(__channel__) -checklinks = config.get_setting('checklinks', __channel__) -checklinks_number = config.get_setting('checklinks_number', __channel__) +host = config.get_setting("channel_host", __channel__) headers = [['Referer', host]] # =========== home menu =================== @@ -156,7 +150,5 @@ def findvideos(item): # Requerido para AutoPlay autoplay.start(itemlist, item) - - support.videolibrary(itemlist, item, 'color kod') return itemlist diff --git a/channels/cinemalibero.json b/channels/cinemalibero.json index 18dfce52..0124d1ad 100644 --- a/channels/cinemalibero.json +++ b/channels/cinemalibero.json @@ -8,6 +8,14 @@ "banner": "https://www.cinemalibero.center/wp-content/themes/Cinemalibero%202.0/images/logo02.png", "categories": ["tvshow", "movie","anime"], "settings": [ + { + "id": "channel_host", + "type": "text", + "label": "Host del canale", + "default": "https://www.cinemalibero.fun/", + "enabled": true, + "visible": true + }, { "id": "include_in_global_search", "type": "bool", diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index f652a95c..22f07591 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -11,6 +11,7 @@ from lib import unshortenit from platformcode import config from platformcode import logger from specials import autoplay +import channelselector # Necessario per Autoplay IDIOMAS = {'Italiano': 'IT'} @@ -24,10 +25,9 @@ checklinks_number = config.get_setting('checklinks_number', 'cinemalibero') __channel__ = "cinemalibero" host = config.get_channel_url(__channel__) + headers = [['Referer', host]] - - def mainlist(item): logger.info('[cinemalibero.py] mainlist') @@ -44,6 +44,15 @@ def mainlist(item): support.menu(itemlist, 'Sport bold', 'video', host+'/category/sport/') autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione) + + 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')) + ) return itemlist diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json index 07ad271e..c78f0e87 100644 --- a/channels/eurostreaming.json +++ b/channels/eurostreaming.json @@ -6,8 +6,16 @@ "language": ["ita"], "thumbnail": "https://eurostreaming.cafe/wp-content/uploads/2017/08/logocafe.png", "bannermenu": "https://eurostreaming.cafe/wp-content/uploads/2017/08/logocafe.png", - "categories": ["tvshow","anime"], + "categories": ["tvshow","anime","vosi"], "settings": [ + { + "id": "channel_host", + "type": "text", + "label": "Host del canale", + "default": "https://eurostreaming.cafe/", + "enabled": true, + "visible": true + }, { "id": "include_in_global_search", "type": "bool", @@ -16,14 +24,6 @@ "enabled": true, "visible": true }, - { - "id": "modo_grafico", - "type": "bool", - "label": "Cerca informazioni extra", - "default": true, - "enabled": true, - "visible": true - }, { "id": "include_in_newest_series", "type": "bool", @@ -39,23 +39,6 @@ "default": true, "enabled": true, "visible": true - }, - { - "id": "checklinks", - "type": "bool", - "label": "Verifica se i link esistono", - "default": true, - "enabled": true, - "visible": true - }, - { - "id": "checklinks_number", - "type": "list", - "label": "Numero de link da verificare", - "default": 1, - "enabled": true, - "visible": "eq(-1,true)", - "lvalues": [ "5", "10", "15", "20" ] }, { "id": "filter_languages", @@ -66,25 +49,9 @@ "visible": true, "lvalues": [ "Non filtrare", - "Italiano", + "ITA", "vosi" ] - }, - { - "id": "perfil", - "type": "list", - "label": "profilo dei colori", - "default": 0, - "enabled": true, - "visible": true, - "lvalues": [ - "Sin color", - "Perfil 5", - "Perfil 4", - "Perfil 3", - "Perfil 2", - "Perfil 1" - ] } ] } diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index afabfa3a..f209b064 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -1,57 +1,71 @@ # -*- coding: utf-8 -*- # ------------------------------------------------------------ # Canale per Eurostreaming -# adattamento di Cineblog01 # by Greko # ------------------------------------------------------------ """ Riscritto per poter usufruire del modulo support. Problemi noti: - Alcun regex possono migliorare + Le regex non prendono tutto... server versystream : 'http://vcrypt.net/very/' # VeryS non decodifica il link :http://vcrypt.net/fastshield/ - server nowvideo.club da implementare nella cartella servers, altri server nei meandri del sito?! + alcuni server tra cui nowvideo.club non sono implementati nella cartella servers Alcune sezioni di anime-cartoni non vanno, alcune hanno solo la lista degli episodi, ma non hanno link altre cambiano la struttura La sezione novità non fa apparire il titolo degli episodi + + In episodios è stata aggiunta la possibilità di configurare la videoteca + """ -import re - -from core import scrapertoolsV2, httptools, tmdb, support +import channelselector +from specials import autoplay, filtertools +from core import scrapertoolsV2, httptools, servertools, tmdb, support from core.item import Item from platformcode import logger, config -from specials import autoplay __channel__ = "eurostreaming" host = config.get_channel_url(__channel__) headers = ['Referer', host] -IDIOMAS = {'Italiano': 'IT'} -list_language = IDIOMAS.values() list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload'] list_quality = ['default'] -checklinks = config.get_setting('checklinks', 'eurostreaming') -checklinks_number = config.get_setting('checklinks_number', 'eurostreaming') +__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'eurostreaming') +__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'eurostreaming') + +IDIOMAS = {'Italiano': 'ITA', 'Sub-ITA':'vosi'} +list_language = IDIOMAS.values() def mainlist(item): + #import web_pdb; web_pdb.set_trace() support.log() itemlist = [] - support.menu(itemlist, 'Serie TV', 'serietv', host, 'tvshow') # mettere sempre episode per serietv, anime!! - support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "category/serie-tv-archive/", 'tvshow') - support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + 'aggiornamento-episodi/', 'tvshow', args='True') - support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + 'category/anime-cartoni-animati/', 'tvshow') - support.menu(itemlist, 'Cerca...', 'search', host, 'tvshow') + support.menu(itemlist, 'Serie TV', 'serietv', host, contentType = 'episode') # mettere sempre episode per serietv, anime!! + support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "category/serie-tv-archive/", contentType = 'episode') + support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + 'aggiornamento-episodi/', args='True', contentType = 'episode') + support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + 'category/anime-cartoni-animati/', contentType = 'episode') + support.menu(itemlist, 'Cerca...', 'search', host, contentType = 'episode') +## itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality) # richiesto 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')) + ) + return itemlist - -def serietv(item): +def serietv(item): + #import web_pdb; web_pdb.set_trace() + # lista serie tv support.log() itemlist = [] if item.args: @@ -65,69 +79,76 @@ def serietv(item): patronNext='a class="next page-numbers" href="?([^>"]+)">Avanti »' itemlist = support.scrape(item, patron_block='', patron=patron, listGroups=listGroups, - patronNext=patronNext, - action='episodios') + patronNext=patronNext, action='episodios') return itemlist + def episodios(item): - support.log() +## import web_pdb; web_pdb.set_trace() + support.log("episodios") itemlist = [] - + # Carica la pagina data = httptools.downloadpage(item.url).data #======== if 'clicca qui per aprire' in data.lower(): - item.url = scrapertoolsV2.find_single_match(data, '"go_to":"(.*?)"') + item.url = scrapertoolsV2.find_single_match(data, '"go_to":"([^"]+)"') item.url = item.url.replace("\\","") # Carica la pagina data = httptools.downloadpage(item.url).data elif 'clicca qui' in data.lower(): - item.url = scrapertoolsV2.find_single_match(data, '

    ') + item.url = scrapertoolsV2.find_single_match(data, '

    ') # Carica la pagina data = httptools.downloadpage(item.url).data #========= + patron = r'(?:<\/span>\w+ STAGIONE\s\d+ (?:\()?(ITA|SUB ITA)(?:\))?<\/div>'\ + '\s*") + if post_data != "": + from lib import jsunpack + data = jsunpack.unpack(post_data) + + block = scrapertools.find_single_match(data, 'sources:\s*\[[^\]]+\]') + if block: data = block + + media_urls = scrapertools.find_multiple_matches(data, '(http.*?\.mp4)') + _headers = urllib.urlencode(dict(headers)) + + for media_url in media_urls: + #logger.info("nowvideo data page_url2 ='%s'" % media_url) + video_urls.append([" mp4 [nowvideo] ", media_url + '|' + _headers]) + + for video_url in media_urls: + logger.info("[nowvideo.py] %s - %s" % (video_url[0], video_url[1])) + + return video_urls + + +def find_videos(data): + encontrados = set() + devuelve = [] + + patronvideos = r"nowvideo.club/(?:play|videos)?([a-z0-9A-Z]+)" + logger.info("[nowvideo.py] find_videos #" + patronvideos + "#") + matches = re.compile(patronvideos, re.DOTALL).findall(data) + + for match in matches: + titulo = "[nowvideo]" + url = 'http://nowvideo.club/%s' % match + + if url not in encontrados: + logger.info(" url=" + url) + devuelve.append([titulo, url, 'nowvideo']) + encontrados.add(url) + else: + logger.info(" url duplicada=" + url) + + return devuelve diff --git a/servers/speedvideo.json b/servers/speedvideo.json index 4e6a0772..5ef92e2c 100644 --- a/servers/speedvideo.json +++ b/servers/speedvideo.json @@ -42,4 +42,4 @@ "visible": false } ] -} \ No newline at end of file +} diff --git a/servers/speedvideo.py b/servers/speedvideo.py index b96fe7fe..c4af3763 100644 --- a/servers/speedvideo.py +++ b/servers/speedvideo.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- +## from core import httptools, scrapertools from platformcode import config, logger - def test_video_exists(page_url): logger.info("(page_url='%s')" % page_url) @@ -14,23 +14,25 @@ def test_video_exists(page_url): return True, "" - -def get_video_url(page_url, - premium=False, - user="", - password="", - video_password=""): +def get_video_url(page_url, premium=False, user="", password="", video_password=""): logger.info("url=" + page_url) video_urls = [] - + data = httptools.downloadpage(page_url).data media_urls = scrapertools.find_multiple_matches(data, r"file:[^']'([^']+)',\s*label:[^\"]\"([^\"]+)\"") - + logger.info("speed video - media urls: %s " % media_urls) for media_url, label in media_urls: media_url = httptools.downloadpage(media_url, only_headers=True, follow_redirects=False).headers.get("location", "") if media_url: video_urls.append([label + " " + media_url.rsplit('.', 1)[1] + ' [speedvideo]', media_url]) - + logger.info("speed video - media urls: %s " % video_urls) return video_urls + + +##, +## { +## "pattern": "speedvideo.net/([A-Z0-9a-z]+)", +## "url": "https:\/\/speedvideo.net\/\\1" +## } diff --git a/servers/turbovid.json b/servers/turbovid.json new file mode 100644 index 00000000..b5c53581 --- /dev/null +++ b/servers/turbovid.json @@ -0,0 +1,42 @@ +{ + "active": true, + "find_videos": { + "ignore_urls": [], + "patterns": [ + { + "pattern": "turbovid.me/([A-z0-9]+)", + "url": "http://turbovid.me/\\1" + } + ] + }, + "free": true, + "id": "turbovid", + "name": "turbovid", + "settings": [ + { + "default": false, + "enabled": true, + "id": "black_list", + "label": "@60654", + "type": "bool", + "visible": true + }, + { + "default": 0, + "enabled": true, + "id": "favorites_servers_list", + "label": "@60655", + "lvalues": [ + "No", + "1", + "2", + "3", + "4", + "5" + ], + "type": "list", + "visible": false + } + ], + "thumbnail": "http://turbovid.me/img/logo.png" +} diff --git a/servers/turbovid.py b/servers/turbovid.py new file mode 100644 index 00000000..387a6d10 --- /dev/null +++ b/servers/turbovid.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- + +import urllib +import time +from core import httptools +from core import scrapertools +from platformcode import logger + + +def test_video_exists(page_url): + logger.info("(page_url='%s')" % page_url) + data = httptools.downloadpage(page_url).data + if "Not Found" in data or "File Does not Exist" in data: + return False, "[turbovid.me] El fichero no existe o ha sido borrado" + return True, "" + + +def get_video_url(page_url, premium=False, user="", password="", video_password="", server='turbovid'): + + logger.info("(turbovid page_url='%s')" % page_url) + video_urls = [] + data = httptools.downloadpage(page_url).data + data = data.replace('"', "'") + page_url_post = scrapertools.find_single_match(data, "") + imhuman = "&imhuman=" + scrapertools.find_single_match(data, "name='imhuman' value='([^']+)'").replace(" ", "+") + post = urllib.urlencode({k: v for k, v in scrapertools.find_multiple_matches(data, "name='([^']+)' value='([^']*)'")}) + imhuman + + time.sleep(6) + data = httptools.downloadpage(page_url_post, post=post).data + logger.info("(data page_url='%s')" % data) + sources = scrapertools.find_single_match(data, 'sources: \[([^\]]+)\]') + + for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'): + media_url = media_url.replace('https:', 'http:') + ext = scrapertools.get_filename_from_url(media_url)[-4:] + video_urls.append(["%s [turbovid]" % (ext), media_url]) + return video_urls diff --git a/servers/wstream.json b/servers/wstream.json index a001f45b..ec73269c 100644 --- a/servers/wstream.json +++ b/servers/wstream.json @@ -9,7 +9,11 @@ { "pattern": "wstream.video/(?:embed-|videos/|video/)?([a-z0-9A-Z]+)", "url": "http:\/\/wstream.video\/\\1" - } + }, + { + "pattern": "wstream.video/(?:embed-|videos/|video/)?([a-z0-9A-Z]+)", + "url": "http:\/\/wstream.video\/video\/\\1" + } ], "ignore_urls": [ ] }, @@ -39,4 +43,4 @@ "visible": false } ] -} \ No newline at end of file +} From 45796c324a6a01e7239c8e48807b3a6cf8507869 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Thu, 6 Jun 2019 22:57:32 +0200 Subject: [PATCH 18/19] some fixes --- channels.json | 2 -- channels/altadefinizione01_club.py | 8 +++---- channels/altadefinizione01_link.py | 15 ++++--------- channels/animeforce.py | 2 +- channels/animespace.py | 16 +++++++------- channels/casacinema.py | 2 +- channels/casacinemaInfo.py | 2 +- channels/cat3plus.py | 2 +- channels/cb01anime.py | 2 +- channels/cinemalibero.py | 9 +------- channels/eurostreaming.py | 15 ++++--------- channels/mondolunatico2.py | 6 ++--- channels/playpornx.py | 2 +- channels/siska.py | 10 ++++----- channels/sleazemovies.py | 2 +- channels/x18hentai.py | 4 ++-- channels/xms.py | 8 +++---- channels/xxxfreeinhd.py | 2 +- servers/deltabit.py | 35 ------------------------------ servers/turbovid.py | 2 +- 20 files changed, 44 insertions(+), 102 deletions(-) diff --git a/channels.json b/channels.json index 98d53014..5572180b 100644 --- a/channels.json +++ b/channels.json @@ -16,7 +16,6 @@ "casacinema": "https://www.casacinema.site", "casacinemainfo": "https://www.casacinema.info", "cb01anime": "http://www.cineblog01.ink", - "cineblog01": "https://cb01.tools", "cinemalibero": "https://cinemalibero.icu", "cinemastreaming": "https://cinemastreaming.icu", "documentaristreamingda": "https://documentari-streaming-da.com", @@ -46,7 +45,6 @@ "ilgeniodellostreaming": "https://ilgeniodellostreaming.pw", "italiafilm": "https://www.italia-film.pw", "italiafilmhd": "https://italiafilm.info", - "italiafilmvedohd": "https://italiafilm.info", "italiaserie": "https://italiaserie.org", "itastreaming": "https://itastreaming.film", "majintoon": "https://toonitalia.org", 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/animeforce.py b/channels/animeforce.py index c38b6d1b..54a14d80 100644 --- a/channels/animeforce.py +++ b/channels/animeforce.py @@ -478,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/animespace.py b/channels/animespace.py index 9e6a6d5a..4f9b88b0 100644 --- a/channels/animespace.py +++ b/channels/animespace.py @@ -42,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/casacinema.py b/channels/casacinema.py index 8758598a..5c742def 100644 --- a/channels/casacinema.py +++ b/channels/casacinema.py @@ -100,7 +100,7 @@ def newest(categoria): def search(item, texto): logger.info("[casacinema.py] " + item.url + " search " + texto) - item.url = host + "?s=" + texto + item.url = host + "/?s=" + texto try: if item.extra == "tvshow": diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py index a853aa5e..9c54779e 100644 --- a/channels/casacinemaInfo.py +++ b/channels/casacinemaInfo.py @@ -63,7 +63,7 @@ def mainlist(item): def search(item, texto): logger.info("[casacinemaInfo.py] " + item.url + " search " + texto) - item.url = host + "?s=" + texto + item.url = host + "/?s=" + texto data = httptools.downloadpage(item.url).data itemlist = [] diff --git a/channels/cat3plus.py b/channels/cat3plus.py index 140056b3..f746a00d 100644 --- a/channels/cat3plus.py +++ b/channels/cat3plus.py @@ -83,7 +83,7 @@ def search(item, texto): logger.info() if texto != "": texto = texto.replace(" ", "+") - item.url = host + "search?q=" + texto + item.url = host + "/search?q=" + texto item.extra = "busqueda" try: return list_all(item) diff --git a/channels/cb01anime.py b/channels/cb01anime.py index c818dcf3..c3b62c31 100644 --- a/channels/cb01anime.py +++ b/channels/cb01anime.py @@ -71,7 +71,7 @@ def listacompleta(item): return build_itemlist(item, 'Z

    (.*?)
    • ', - '
  • ([^<]+)
    • ', "episodios") + '
  • ([^<]+)
    • ', "episodios") def build_itemlist(item, re_bloque, re_patron, iaction): diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index 22f07591..58634f13 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -45,14 +45,7 @@ def mainlist(item): autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione) - 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/eurostreaming.py b/channels/eurostreaming.py index f209b064..a80cb31b 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -42,9 +42,9 @@ def mainlist(item): itemlist = [] support.menu(itemlist, 'Serie TV', 'serietv', host, contentType = 'episode') # mettere sempre episode per serietv, anime!! - support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "category/serie-tv-archive/", contentType = 'episode') - support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + 'aggiornamento-episodi/', args='True', contentType = 'episode') - support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + 'category/anime-cartoni-animati/', contentType = 'episode') + support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "/category/serie-tv-archive/", contentType = 'episode') + support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + '/aggiornamento-episodi/', args='True', contentType = 'episode') + support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + '/category/anime-cartoni-animati/', contentType = 'episode') support.menu(itemlist, 'Cerca...', 'search', host, contentType = 'episode') ## itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality) @@ -52,14 +52,7 @@ def mainlist(item): 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/mondolunatico2.py b/channels/mondolunatico2.py index d08863a0..2f4b18ef 100644 --- a/channels/mondolunatico2.py +++ b/channels/mondolunatico2.py @@ -31,9 +31,9 @@ def mainlist(item): support.menu(itemlist, 'Ultime Richieste Inserite bold', 'carousel_request', host, contentType='movie', args='movies') support.menu(itemlist, 'Film Nelle Sale bold', 'carousel_cinema', host, contentType='movie', args='movies') support.menu(itemlist, 'Film Ultimi Inseriti submenu', 'carousel_last', host, contentType='movie', args='movies') - support.menu(itemlist, 'Film Top ImDb submenu', 'top_imdb', host + 'top-imdb/', contentType='movie', args='movies') + support.menu(itemlist, 'Film Top ImDb submenu', 'top_imdb', host + '/top-imdb/', contentType='movie', args='movies') support.menu(itemlist, 'Serie TV', 'carousel_episodes', host, contentType='episode', args='tvshows') - support.menu(itemlist, 'Serie TV Top ImDb submenu', 'top_serie', host + 'top-imdb/', contentType='episode', args='tvshows') + support.menu(itemlist, 'Serie TV Top ImDb submenu', 'top_serie', host + '/top-imdb/', contentType='episode', args='tvshows') support.menu(itemlist, '[COLOR blue]Cerca...[/COLOR] bold', 'search', host) autoplay.init(item.channel, list_servers, list_quality) autoplay.show_option(item.channel, itemlist) @@ -146,7 +146,7 @@ def top_serie(item): def search(item, texto): logger.info("[mondolunatico2.py] " + item.url + " search " + texto) - item.url = host + "?s=" + texto + item.url = host + "/?s=" + texto try: return peliculas(item) diff --git a/channels/playpornx.py b/channels/playpornx.py index 54a45d57..8a03ef39 100644 --- a/channels/playpornx.py +++ b/channels/playpornx.py @@ -22,7 +22,7 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, title="Escenas", action="lista", url = urlparse.urljoin(host, "category/xxx-scenes/"))) - itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=', + itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + '/?s=', thumbnail='https://s30.postimg.cc/pei7txpa9/buscar.png', fanart='https://s30.postimg.cc/pei7txpa9/buscar.png')) diff --git a/channels/siska.py b/channels/siska.py index 92001dd9..b38151da 100644 --- a/channels/siska.py +++ b/channels/siska.py @@ -16,11 +16,11 @@ def mainlist(item): logger.info() itemlist = [] - itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "newVideo.php?language=en")) - itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "MostViewed.php?views=month&language=en")) - itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "Channel.php?language=en")) + itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/newVideo.php?language=en")) + itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/MostViewed.php?views=month&language=en")) + itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/Channel.php?language=en")) - itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "index.php?category=1&language=en")) + itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/index.php?category=1&language=en")) itemlist.append( Item(channel=item.channel, title="Buscar", action="search")) return itemlist @@ -28,7 +28,7 @@ def mainlist(item): def search(item, texto): logger.info() texto = texto.replace(" ", "+") - item.url = host + "search.php?q=%s&language=en&search=Search" % texto + item.url = host + "/search.php?q=%s&language=en&search=Search" % texto try: return lista(item) except: diff --git a/channels/sleazemovies.py b/channels/sleazemovies.py index 1f7d8744..a3574ee5 100644 --- a/channels/sleazemovies.py +++ b/channels/sleazemovies.py @@ -71,7 +71,7 @@ def search(item, texto): logger.info() if texto != "": texto = texto.replace(" ", "+") - item.url = host + "?s=" + texto + item.url = host + "/?s=" + texto item.extra = "busqueda" try: return list_all(item) diff --git a/channels/x18hentai.py b/channels/x18hentai.py index f6aa698b..db4b37ec 100644 --- a/channels/x18hentai.py +++ b/channels/x18hentai.py @@ -22,11 +22,11 @@ def mainlist(item): itemlist.append(Item(channel=item.channel, title="Todos", action="todas", url=host, thumbnail='', fanart='')) itemlist.append( - Item(channel=item.channel, title="Sin Censura", action="todas", url=host + 'tag/sin-censura/', thumbnail='', + Item(channel=item.channel, title="Sin Censura", action="todas", url=host + '/tag/sin-censura/', thumbnail='', fanart='')) itemlist.append( - Item(channel=item.channel, title="Estrenos", action="todas", url=host + 'category/estreno/', thumbnail='', + Item(channel=item.channel, title="Estrenos", action="todas", url=host + '/category/estreno/', thumbnail='', fanart='')) itemlist.append( diff --git a/channels/xms.py b/channels/xms.py index ad360a8c..969aae7e 100644 --- a/channels/xms.py +++ b/channels/xms.py @@ -45,20 +45,20 @@ def mainlist(item): logger.info() itemlist = [] - itemlist.append(Item(channel=__channel__, title="Últimas", url=host + '?filtre=date&cat=0', + itemlist.append(Item(channel=__channel__, title="Últimas", url=host + '/?filtre=date&cat=0', action="peliculas", viewmode="movie_with_plot", viewcontent='movies', thumbnail=thumbnail % '1')) - itemlist.append(Item(channel=__channel__, title="Más Vistas", url=host + '?display=extract&filtre=views', + itemlist.append(Item(channel=__channel__, title="Más Vistas", url=host + '/?display=extract&filtre=views', action="peliculas", viewmode="movie_with_plot", viewcontent='movies', thumbnail=thumbnail % '2')) - itemlist.append(Item(channel=__channel__, title="Mejor Valoradas", url=host + '?display=extract&filtre=rate', + itemlist.append(Item(channel=__channel__, title="Mejor Valoradas", url=host + '/?display=extract&filtre=rate', action="peliculas", viewmode="movie_with_plot", viewcontent='movies', thumbnail=thumbnail % '3')) itemlist.append(Item(channel=__channel__, title="Categorías", action="categorias", - url=host + 'categories/', viewmode="movie_with_plot", viewcontent='movies', + url=host + '/categories/', viewmode="movie_with_plot", viewcontent='movies', thumbnail=thumbnail % '4')) itemlist.append(Item(channel=__channel__, title="WebCam", action="webcamenu", diff --git a/channels/xxxfreeinhd.py b/channels/xxxfreeinhd.py index 89637648..b29172a4 100644 --- a/channels/xxxfreeinhd.py +++ b/channels/xxxfreeinhd.py @@ -29,7 +29,7 @@ def mainlist(item): def search(item, texto): logger.info() texto = texto.replace(" ", "+") - item.url = host + "search.php?q=%s&language=en&search=Search" % texto + item.url = host + "/search.php?q=%s&language=en&search=Search" % texto try: return lista(item) except: diff --git a/servers/deltabit.py b/servers/deltabit.py index 34c76456..1e60f022 100644 --- a/servers/deltabit.py +++ b/servers/deltabit.py @@ -7,38 +7,3 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): return turbovid.get_video_url(page_url, premium, user, password, video_password, 'deltabit') - -##import time -##import urllib -## -##from core import httptools -##from core import scrapertools -##from platformcode import logger -## -## -##def test_video_exists(page_url): -## logger.info("(page_url='%s')" % page_url) -## data = httptools.downloadpage(page_url).data -## if "Not Found" in data or "File Does not Exist" in data: -## return False, "[deltabit] El fichero no existe o ha sido borrado" -## return True, "" -## -## -##def get_video_url(page_url, premium=False, user="", password="", video_password=""): -#### logger.info("(deltabit page_url='%s')" % page_url) -## video_urls = [] -## data = httptools.downloadpage(page_url).data -## data = data.replace('"', "'") -## page_url_post = scrapertools.find_single_match(data, "") -## imhuman = "&imhuman=" + scrapertools.find_single_match(data, "name='imhuman' value='([^']+)'").replace(" ", "+") -## post = urllib.urlencode({k: v for k, v in scrapertools.find_multiple_matches(data, "name='([^']+)' value='([^']*)'")}) + imhuman -## time.sleep(6) -## data = httptools.downloadpage(page_url_post, post=post).data -#### logger.info("(data page_url='%s')" % data) -## sources = scrapertools.find_single_match(data, 'sources: \[([^\]]+)\]') -## -## for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'): -## media_url = media_url.replace('https:', 'http:') -## ext = scrapertools.get_filename_from_url(media_url)[-4:] -## video_urls.append(["%s [deltabit]" % (ext), media_url]) -## return video_urls diff --git a/servers/turbovid.py b/servers/turbovid.py index 387a6d10..9235834e 100644 --- a/servers/turbovid.py +++ b/servers/turbovid.py @@ -33,5 +33,5 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= for media_url in scrapertools.find_multiple_matches(sources, '"([^"]+)"'): media_url = media_url.replace('https:', 'http:') ext = scrapertools.get_filename_from_url(media_url)[-4:] - video_urls.append(["%s [turbovid]" % (ext), media_url]) + video_urls.append(["%s [%s]" % (ext, server), media_url]) return video_urls From 6bc54772adb7cebc4b09be16bec474b0326cd247 Mon Sep 17 00:00:00 2001 From: cttynul Date: Fri, 7 Jun 2019 04:08:35 +0200 Subject: [PATCH 19/19] + autostart KOD at Kodi boot option --- platformcode/config.py | 28 +++++++++++++++++++++++++++ resources/language/English/strings.po | 22 ++++++++++++++++++++- resources/language/Italian/strings.po | 22 ++++++++++++++++++++- specials/setting.py | 19 +++++++++++++++--- 4 files changed, 86 insertions(+), 5 deletions(-) diff --git a/platformcode/config.py b/platformcode/config.py index fa40f764..ff8bf758 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -115,6 +115,34 @@ def get_system_platform(): platform = "osx" return platform +def is_autorun_enabled(): + try: + if "xbmc.executebuiltin('XBMC.RunAddon(plugin.video.kod)')" in open(os.path.join(xbmc.translatePath('special://userdata'),'autoexec.py')).read(): + return True + else: + return False + except: + # if error in reading from file autoexec doesnt exists + return False + + +def enable_disable_autorun(is_enabled): + # using autoexec.py and not service.py to force autorun + + path = os.path.join(xbmc.translatePath('special://userdata'),'autoexec.py') + append_write = 'a' if os.path.exists(path) else 'w' + + if is_enabled is False: + with open(path, append_write) as file: + file.write("import xbmc\nxbmc.executebuiltin('XBMC.RunAddon(plugin.video.kod)')") + else: + file = open(path, "r") + old_content = file.read() + new_content = old_content.replace("xbmc.executebuiltin('XBMC.RunAddon(plugin.video.kod)')", "") + file.close() + with open(path, "w") as file: + file.write(new_content) + return True def get_all_settings_addon(): # Lee el archivo settings.xml y retorna un diccionario con {id: value} diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index ac92b2ff..ac2b8489 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -5518,4 +5518,24 @@ msgstr "" msgctxt "#70705" msgid "Use your custom channel URLs" -msgstr "" \ No newline at end of file +msgstr "" + +msgctxt "#70706" +msgid "autostart KOD at Kodi boot" +msgstr "" + +msgctxt "#70707" +msgid "Enable" +msgstr "" + +msgctxt "#70708" +msgid "Disable" +msgstr "" + +msgctxt "#70710" +msgid "Your new settings has just been saved" +msgstr "Le nuove impostazioni sono state salvate" + +msgctxt "#70711" +msgid "Ops! There's been a problem during saving your setting" +msgstr "Ops! C'è stato un problema durante il salvataggio delle impostazioni" \ No newline at end of file diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po index cac29cd2..01439b7e 100644 --- a/resources/language/Italian/strings.po +++ b/resources/language/Italian/strings.po @@ -5518,4 +5518,24 @@ msgstr "TMDB ID (0 per annullare)" msgctxt "#70705" msgid "Use your custom channel URLs" -msgstr "Utilizza URL personalizzati per i canali" \ No newline at end of file +msgstr "Utilizza URL personalizzati per i canali" + +msgctxt "#70706" +msgid "autostart KOD at Kodi boot" +msgstr "avvio automatico di KOD al boot di Kodi" + +msgctxt "#70707" +msgid "Enable" +msgstr "Attivia" + +msgctxt "#70708" +msgid "Disable" +msgstr "Disattiva" + +msgctxt "#70709" +msgid "Your new settings has just been saved" +msgstr "Le nuove impostazioni sono state salvate" + +msgctxt "#70710" +msgid "Ops! There's been a problem during saving your setting" +msgstr "Ops! C'è stato un problema durante il salvataggio delle impostazioni" \ No newline at end of file diff --git a/specials/setting.py b/specials/setting.py index 18e57416..d3b825d0 100644 --- a/specials/setting.py +++ b/specials/setting.py @@ -11,7 +11,7 @@ from platformcode import config, logger from platformcode import platformtools CHANNELNAME = "setting" - +AUTOSTART = config.is_autorun_enabled() def mainlist(item): logger.info() @@ -20,7 +20,7 @@ def mainlist(item): itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60535), action="settings", folder=False, thumbnail=get_thumb("setting_0.png"))) - itemlist.append(Item(channel=CHANNELNAME, title="", action="", folder=False, thumbnail=get_thumb("setting_0.png"))) + #itemlist.append(Item(channel=CHANNELNAME, title="", action="", folder=False, thumbnail=get_thumb("setting_0.png"))) itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60536) + ":", text_bold=True, action="", folder=False, thumbnail=get_thumb("setting_0.png"))) @@ -43,7 +43,13 @@ def mainlist(item): itemlist.append(Item(channel=CHANNELNAME, title=" " + config.get_localized_string(70253), action="setting_torrent", folder=True, thumbnail=get_thumb("channels_torrent.png"))) - itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, thumbnail=get_thumb("setting_0.png"))) + if AUTOSTART is False: + autostart_mode = config.get_localized_string(70707) + else: + autostart_mode = config.get_localized_string(70708) + itemlist.append(Item(channel=CHANNELNAME, title=autostart_mode + " " + config.get_localized_string(70706), action="autostart", folder=False, thumbnail=get_thumb("setting_0.png"))) + + #itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, thumbnail=get_thumb("setting_0.png"))) itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60544), action="submenu_tools", folder=True, thumbnail=get_thumb("setting_0.png"))) @@ -84,6 +90,13 @@ def channel_config(item): item.config)) +def autostart(): + if config.enable_disable_autorun(AUTOSTART): + xbmcgui.Dialog().ok(config.get_localized_string(20000), config.get_localized_string(70709)) + else: + xbmcgui.Dialog().ok(config.get_localized_string(20000), config.get_localized_string(70710)) + + def setting_torrent(item): logger.info()