From 84dae6f6f442290ea99779de32f472bbabd30cbf Mon Sep 17 00:00:00 2001 From: Alhaziel Date: Sat, 25 May 2019 16:00:13 +0200 Subject: [PATCH] Check links in support --- channels/altadefinizione01.json | 4 +-- channels/altadefinizione01.py | 8 +++--- channels/altadefinizione01_club.json | 4 +-- channels/altadefinizione01_club.py | 8 +++--- channels/altadefinizione01_link.json | 4 +-- channels/altadefinizione01_link.py | 8 +++--- channels/altadefinizioneclick.json | 4 +-- channels/altadefinizioneclick.py | 8 +++--- channels/altadefinizionehd.json | 4 +-- channels/animeleggendari.json | 4 +-- channels/animeleggendari.py | 8 +++--- channels/animesaturn.json | 4 +-- channels/animesaturn.py | 8 +++--- channels/animespace.json | 2 +- channels/animespace.py | 8 +++--- channels/animeworld.json | 4 +-- channels/animeworld.py | 8 +++--- channels/casacinema.json | 4 +-- channels/casacinemaInfo.py | 8 +++--- channels/cineblog01.json | 4 +-- channels/cineblog01.py | 8 +++--- channels/cinemalibero.json | 4 +-- channels/cinemalibero.py | 8 +++--- channels/cinemastreaming.json | 4 +-- channels/eurostreaming.json | 4 +-- channels/eurostreaming.py | 4 +-- channels/fastsubita.json | 4 +-- channels/fastsubita.py | 8 +++--- channels/filmigratis.json | 4 +-- channels/filmigratis.py | 4 +-- channels/filmsenzalimiti.json | 4 +-- channels/filmsenzalimiti.py | 8 +++--- channels/filmsenzalimiticc.json | 4 +-- channels/filmsenzalimiticc.py | 8 +++--- channels/ilgeniodellostreaming.json | 4 +-- channels/ilgeniodellostreaming.py | 8 +++--- channels/italiafilmhd.json | 4 +-- channels/italiafilmhd.py | 8 +++--- channels/mondoserietv.json | 4 +-- channels/mondoserietv.py | 8 +++--- channels/piratestreaming.py | 8 +++--- channels/seriehd.json | 4 +-- channels/seriehd.py | 8 +++--- channels/serietvsubita.json | 4 +-- channels/serietvsubita.py | 8 +++--- channels/serietvu.json | 4 +-- channels/serietvu.py | 12 ++++----- channels/tantifilm.json | 4 +-- channels/toonitalia.json | 4 +-- core/channeltools.py | 6 ++--- core/support.py | 40 +++++++++++++++------------- 51 files changed, 164 insertions(+), 164 deletions(-) diff --git a/channels/altadefinizione01.json b/channels/altadefinizione01.json index 0596d45d..ed51566e 100644 --- a/channels/altadefinizione01.json +++ b/channels/altadefinizione01.json @@ -33,7 +33,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero di link da verificare", "default": 1, diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py index d97eefd8..8fdd4a12 100644 --- a/channels/altadefinizione01.py +++ b/channels/altadefinizione01.py @@ -16,8 +16,8 @@ list_language = IDIOMAS.values() list_servers = ['openload', 'streamango', 'rapidvideo', 'streamcherry', 'megadrive'] list_quality = ['default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'altadefinizione01') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'altadefinizione01') +checklinks = config.get_setting('checklinks', 'altadefinizione01') +checklinks_number = config.get_setting('checklinks_number', 'altadefinizione01') headers = [['Referer', host]] blacklist_categorie = ['Altadefinizione01', 'Altadefinizione.to'] @@ -147,8 +147,8 @@ def findvideos(item): itemlist = support.server(item, headers=headers) # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools # itemlist = filtertools.get_links(itemlist, item, list_language) diff --git a/channels/altadefinizione01_club.json b/channels/altadefinizione01_club.json index 19890b5b..7dc55b71 100644 --- a/channels/altadefinizione01_club.json +++ b/channels/altadefinizione01_club.json @@ -44,7 +44,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": true, @@ -52,7 +52,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py index 4f0ebf42..3185eaa4 100644 --- a/channels/altadefinizione01_club.py +++ b/channels/altadefinizione01_club.py @@ -19,8 +19,8 @@ host = "https://www.altadefinizione01.vision/" #aggiornato al 30-04-209 # ======== Funzionalità ============================= -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) +checklinks = config.get_setting('checklinks', __channel__) +checklinks_number = config.get_setting('checklinks_number', __channel__) headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], ['Referer', host]] @@ -216,8 +216,8 @@ def findvideos(item): logger.error("data doesn't contain expected URL") # Controlla se i link sono validi - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools itemlist = filtertools.get_links(itemlist, item, list_language) diff --git a/channels/altadefinizione01_link.json b/channels/altadefinizione01_link.json index e56d2b1a..47cb3ac3 100644 --- a/channels/altadefinizione01_link.json +++ b/channels/altadefinizione01_link.json @@ -46,7 +46,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": true, @@ -54,7 +54,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py index 22ad517d..7e690035 100644 --- a/channels/altadefinizione01_link.py +++ b/channels/altadefinizione01_link.py @@ -22,8 +22,8 @@ host = "https://altadefinizione01.voto/" #aggiornato al 3 maggio 2019 # ======== def per utility INIZIO ============================ -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) +checklinks = config.get_setting('checklinks', __channel__) +checklinks_number = config.get_setting('checklinks_number', __channel__) headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'], ['Referer', host]]#,['Accept-Language','it-IT,it;q=0.8,en-US;q=0.5,en;q=0.3']] @@ -176,8 +176,8 @@ def findvideos(item): logger.error("data doesn't contain expected URL") # Controlla se i link sono validi - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools itemlist = filtertools.get_links(itemlist, item, list_language) diff --git a/channels/altadefinizioneclick.json b/channels/altadefinizioneclick.json index 05339015..bacbb3c0 100644 --- a/channels/altadefinizioneclick.json +++ b/channels/altadefinizioneclick.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py index 3037f154..b4f3858a 100644 --- a/channels/altadefinizioneclick.py +++ b/channels/altadefinizioneclick.py @@ -17,8 +17,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'streamango', "vidoza", "thevideo", "okru", 'youtube'] list_quality = ['1080p'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'altadefinizioneclick') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'altadefinizioneclick') +checklinks = config.get_setting('checklinks', 'altadefinizioneclick') +checklinks_number = config.get_setting('checklinks_number', 'altadefinizioneclick') headers = [['Referer', host]] @@ -98,8 +98,8 @@ def findvideos(item): itemlist = support.hdpass_get_servers(item) - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # itemlist = filtertools.get_links(itemlist, item, list_language) diff --git a/channels/altadefinizionehd.json b/channels/altadefinizionehd.json index b410f36c..3efdad33 100644 --- a/channels/altadefinizionehd.json +++ b/channels/altadefinizionehd.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/animeleggendari.json b/channels/animeleggendari.json index 2306345e..ac5a6b52 100644 --- a/channels/animeleggendari.json +++ b/channels/animeleggendari.json @@ -33,7 +33,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py index 285f3393..8ac1b391 100644 --- a/channels/animeleggendari.py +++ b/channels/animeleggendari.py @@ -20,8 +20,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'streamango'] list_quality = ['default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animeleggendari') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animeleggendari') +checklinks = config.get_setting('checklinks', 'animeleggendari') +checklinks_number = config.get_setting('checklinks_number', 'animeleggendari') def mainlist(item): log() @@ -176,8 +176,8 @@ def findvideos(item): itemlist = support.server(item,data) - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # itemlist = filtertools.get_links(itemlist, item, list_language) autoplay.start(itemlist, item) diff --git a/channels/animesaturn.json b/channels/animesaturn.json index 627d4fe0..3bd40f70 100644 --- a/channels/animesaturn.json +++ b/channels/animesaturn.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/animesaturn.py b/channels/animesaturn.py index 7f88cef5..c48377c8 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -22,8 +22,8 @@ list_language = IDIOMAS.values() list_servers = ['openload','fembed'] list_quality = ['default'] -# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) -# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) +# checklinks = config.get_setting('checklinks', __channel__) +# checklinks_number = config.get_setting('checklinks_number', __channel__) def mainlist(item): @@ -263,8 +263,8 @@ def findvideos(item): # Controlla se i link sono validi - # if __comprueba_enlaces__: - # itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + # if checklinks: + # itemlist = servertools.check_list_links(itemlist, checklinks_number) # # autoplay.start(itemlist, item) diff --git a/channels/animespace.json b/channels/animespace.json index fc66d0bd..4a7f4084 100644 --- a/channels/animespace.json +++ b/channels/animespace.json @@ -32,7 +32,7 @@ ] }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Número de enlaces a verificar", "default": 1, diff --git a/channels/animespace.py b/channels/animespace.py index 7634a5fd..aa910a86 100644 --- a/channels/animespace.py +++ b/channels/animespace.py @@ -17,8 +17,8 @@ from specials import renumbertools host = "https://animespace.tv/" -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animespace') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animespace') +checklinks = config.get_setting('checklinks', 'animespace') +checklinks_number = config.get_setting('checklinks_number', 'animespace') IDIOMAS = {'VOSE': 'VOSE'} list_language = IDIOMAS.values() @@ -240,8 +240,8 @@ def findvideos(item): itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize()) - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/animeworld.json b/channels/animeworld.json index 3293a0bb..dfcee138 100644 --- a/channels/animeworld.json +++ b/channels/animeworld.json @@ -32,7 +32,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -40,7 +40,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/animeworld.py b/channels/animeworld.py index ff56efef..4a1586be 100644 --- a/channels/animeworld.py +++ b/channels/animeworld.py @@ -20,8 +20,8 @@ list_language = IDIOMAS.values() list_servers = ['diretto'] list_quality = [] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animeworld') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animeworld') +checklinks = config.get_setting('checklinks', 'animeworld') +checklinks_number = config.get_setting('checklinks_number', 'animeworld') def mainlist(item): @@ -398,8 +398,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/casacinema.json b/channels/casacinema.json index dc407caf..c964ad15 100644 --- a/channels/casacinema.json +++ b/channels/casacinema.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py index a371b392..c9c969ed 100644 --- a/channels/casacinemaInfo.py +++ b/channels/casacinemaInfo.py @@ -15,8 +15,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] list_quality = ['1080p', '720', '480p', '360p'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'casacinema') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'casacinema') +checklinks = config.get_setting('checklinks', 'casacinema') +checklinks_number = config.get_setting('checklinks_number', 'casacinema') def mainlist(item): @@ -142,8 +142,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para AutoPlay diff --git a/channels/cineblog01.json b/channels/cineblog01.json index c4b1c672..b2110524 100644 --- a/channels/cineblog01.json +++ b/channels/cineblog01.json @@ -33,7 +33,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero di link da verificare", "default": 1, diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 8000c555..b6859b2d 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -27,8 +27,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'streamango', 'wstream'] list_quality = ['HD', 'default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cineblog01') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'cineblog01') +checklinks = config.get_setting('checklinks', 'cineblog01') +checklinks_number = config.get_setting('checklinks_number', 'cineblog01') # esclusione degli articoli 'di servizio' blacklist = ['BENVENUTI', 'Richieste Serie TV', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE ', @@ -280,8 +280,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/cinemalibero.json b/channels/cinemalibero.json index d55e578d..18dfce52 100644 --- a/channels/cinemalibero.json +++ b/channels/cinemalibero.json @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -57,7 +57,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index 1b0c0670..2709560f 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -19,8 +19,8 @@ list_servers = ['akstream', 'wstream', 'openload', 'streamango'] list_quality = ['default'] # Necessario per Verifica Link -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cinemalibero') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'cinemalibero') +checklinks = config.get_setting('checklinks', 'cinemalibero') +checklinks_number = config.get_setting('checklinks_number', 'cinemalibero') host = 'https://www.cinemalibero.icu' @@ -219,8 +219,8 @@ def findvideos(item): # Questa def. deve sempre essere nominata findvideos action='add_pelicula_to_library', extra='findservers', contentTitle=item.contentTitle)) # Necessario per filtrare i Link - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Necessario per FilterTools # itemlist = filtertools.get_links(itemlist, item, list_language) diff --git a/channels/cinemastreaming.json b/channels/cinemastreaming.json index d229b77b..261f294b 100644 --- a/channels/cinemastreaming.json +++ b/channels/cinemastreaming.json @@ -42,7 +42,7 @@ }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -50,7 +50,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json index e4641e02..07ad271e 100644 --- a/channels/eurostreaming.json +++ b/channels/eurostreaming.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": true, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py index d2687933..3197c73a 100644 --- a/channels/eurostreaming.py +++ b/channels/eurostreaming.py @@ -30,8 +30,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload'] list_quality = ['default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'eurostreaming') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'eurostreaming') +checklinks = config.get_setting('checklinks', 'eurostreaming') +checklinks_number = config.get_setting('checklinks_number', 'eurostreaming') def mainlist(item): support.log() diff --git a/channels/fastsubita.json b/channels/fastsubita.json index a18c5eeb..dead1163 100644 --- a/channels/fastsubita.json +++ b/channels/fastsubita.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/fastsubita.py b/channels/fastsubita.py index f2bba2a5..9318a714 100644 --- a/channels/fastsubita.py +++ b/channels/fastsubita.py @@ -18,8 +18,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'speedvideo', 'wstream', 'flashx', 'vidoza', 'vidtome'] list_quality = ['default'] -# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'fastsubita') -# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'fastsubita') +# checklinks = config.get_setting('checklinks', 'fastsubita') +# checklinks_number = config.get_setting('checklinks_number', 'fastsubita') headers = [ ['Host', 'fastsubita.com'], @@ -277,8 +277,8 @@ def findvideos(item): # # # Requerido para Filtrar enlaces # - # if __comprueba_enlaces__: - # itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + # if checklinks: + # itemlist = servertools.check_list_links(itemlist, checklinks_number) # # # Requerido para FilterTools # diff --git a/channels/filmigratis.json b/channels/filmigratis.json index 53f6e70f..b6f56db2 100644 --- a/channels/filmigratis.json +++ b/channels/filmigratis.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/filmigratis.py b/channels/filmigratis.py index 1a1a28b3..a7bc6a09 100644 --- a/channels/filmigratis.py +++ b/channels/filmigratis.py @@ -18,8 +18,8 @@ list_language = IDIOMAS.values() list_servers = ['openload', 'streamango', 'vidoza', 'okru'] list_quality = ['1080p', '720p', '480p', '360'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmigratis') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmigratis') +checklinks = config.get_setting('checklinks', 'filmigratis') +checklinks_number = config.get_setting('checklinks_number', 'filmigratis') headers = [['Referer', host]] diff --git a/channels/filmsenzalimiti.json b/channels/filmsenzalimiti.json index 698e2f2a..db57b0c2 100644 --- a/channels/filmsenzalimiti.json +++ b/channels/filmsenzalimiti.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/filmsenzalimiti.py b/channels/filmsenzalimiti.py index de62f0c4..5723a1cd 100644 --- a/channels/filmsenzalimiti.py +++ b/channels/filmsenzalimiti.py @@ -19,8 +19,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'streamango', 'vidoza', 'okru'] list_quality = ['1080p', '720p', '480p', '360'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmsenzalimiti') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmsenzalimiti') +checklinks = config.get_setting('checklinks', 'filmsenzalimiti') +checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiti') headers = [['Referer', host]] @@ -174,8 +174,8 @@ def findvideos(item): action="add_pelicula_to_library", extra="findservers", contentTitle=item.contentTitle)) #Necessario per filtrare i Link - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Necessario per FilterTools # itemlist = filtertools.get_links(itemlist, item, list_language) diff --git a/channels/filmsenzalimiticc.json b/channels/filmsenzalimiticc.json index 2bbe1ec3..81f21615 100644 --- a/channels/filmsenzalimiticc.json +++ b/channels/filmsenzalimiticc.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py index 7db3b9b5..e4029d77 100644 --- a/channels/filmsenzalimiticc.py +++ b/channels/filmsenzalimiticc.py @@ -22,8 +22,8 @@ list_servers = ['verystream', 'openload', 'vidlox', 'youtube'] list_quality = ['default'] # Necessario per Verifica Link -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmsenzalimiticc') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmsenzalimiticc') +checklinks = config.get_setting('checklinks', 'filmsenzalimiticc') +checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiticc') host = 'https://filmsenzalimiti.pw' @@ -239,8 +239,8 @@ def findvideos(item): # Questa def. deve sempre essere nominata findvideos action='add_pelicula_to_library', extra='findservers', contentTitle=item.contentTitle)) # Necessario per filtrare i Link - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Necessario per FilterTools # itemlist = filtertools.get_links(itemlist, item, list_language) diff --git a/channels/ilgeniodellostreaming.json b/channels/ilgeniodellostreaming.json index 1d1afbcc..d9a6cbaf 100644 --- a/channels/ilgeniodellostreaming.json +++ b/channels/ilgeniodellostreaming.json @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -57,7 +57,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py index a88dafe4..92b4aff1 100644 --- a/channels/ilgeniodellostreaming.py +++ b/channels/ilgeniodellostreaming.py @@ -22,8 +22,8 @@ list_servers = ['verystream', 'openload', 'streamango', 'youtube'] list_quality = ['default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'ilgeniodellostreaming') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'ilgeniodellostreaming') +checklinks = config.get_setting('checklinks', 'ilgeniodellostreaming') +checklinks_number = config.get_setting('checklinks_number', 'ilgeniodellostreaming') headers = [['Referer', host]] @@ -372,8 +372,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/italiafilmhd.json b/channels/italiafilmhd.json index cfae73d3..f64aa115 100644 --- a/channels/italiafilmhd.json +++ b/channels/italiafilmhd.json @@ -34,7 +34,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -42,7 +42,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero di link da verificare", "default": 1, diff --git a/channels/italiafilmhd.py b/channels/italiafilmhd.py index 9ab4a0ab..0aeeb189 100644 --- a/channels/italiafilmhd.py +++ b/channels/italiafilmhd.py @@ -17,8 +17,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'youtube'] list_quality = ['default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'italiafilmhd') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'italiafilmhd') +checklinks = config.get_setting('checklinks', 'italiafilmhd') +checklinks_number = config.get_setting('checklinks_number', 'italiafilmhd') host = "https://italiafilm.network" @@ -296,8 +296,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/mondoserietv.json b/channels/mondoserietv.json index 74a150ed..cae7032d 100644 --- a/channels/mondoserietv.json +++ b/channels/mondoserietv.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py index fc8e1498..7ca2e916 100644 --- a/channels/mondoserietv.py +++ b/channels/mondoserietv.py @@ -19,8 +19,8 @@ list_language = IDIOMAS.values() list_servers = ['akstream'] list_quality = ['default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'mondoserietv') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'mondoserietv') +checklinks = config.get_setting('checklinks', 'mondoserietv') +checklinks_number = config.get_setting('checklinks_number', 'mondoserietv') headers = {'Referer': host} @@ -308,8 +308,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py index a3598e2a..f00b0b9d 100644 --- a/channels/piratestreaming.py +++ b/channels/piratestreaming.py @@ -24,8 +24,8 @@ list_servers = ['speedvideo', 'openload', 'youtube'] list_quality = ['default'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'piratestreaming') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'piratestreaming') +checklinks = config.get_setting('checklinks', 'piratestreaming') +checklinks_number = config.get_setting('checklinks_number', 'piratestreaming') headers = [['Referer', host]] @@ -243,8 +243,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/seriehd.json b/channels/seriehd.json index e2a505ec..2d5a19b2 100644 --- a/channels/seriehd.json +++ b/channels/seriehd.json @@ -33,7 +33,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/seriehd.py b/channels/seriehd.py index 7a1e5974..5059cf5e 100644 --- a/channels/seriehd.py +++ b/channels/seriehd.py @@ -18,8 +18,8 @@ list_language = IDIOMAS.values() list_servers = ['verystream', 'openload', 'streamango', 'thevideome'] list_quality = ['1080p', '720p', '480p', '360'] -__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'seriehd') -__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'seriehd') +checklinks = config.get_setting('checklinks', 'seriehd') +checklinks_number = config.get_setting('checklinks_number', 'seriehd') headers = [['Referer', host]] @@ -137,8 +137,8 @@ def findvideos(item): # Requerido para Filtrar enlaces - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + if checklinks: + itemlist = servertools.check_list_links(itemlist, checklinks_number) # Requerido para FilterTools diff --git a/channels/serietvsubita.json b/channels/serietvsubita.json index 7a4eafad..2c2daf83 100644 --- a/channels/serietvsubita.json +++ b/channels/serietvsubita.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py index 0e587acc..1b43e617 100644 --- a/channels/serietvsubita.py +++ b/channels/serietvsubita.py @@ -21,8 +21,8 @@ list_language = IDIOMAS.values() list_servers = ['gounlimited','verystream','streamango','openload'] list_quality = ['default'] -# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) -# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) +# checklinks = config.get_setting('checklinks', __channel__) +# checklinks_number = config.get_setting('checklinks_number', __channel__) def mainlist(item): @@ -264,8 +264,8 @@ def findvideos(item): # Controlla se i link sono validi - # if __comprueba_enlaces__: - # itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + # if checklinks: + # itemlist = servertools.check_list_links(itemlist, checklinks_number) # # autoplay.start(itemlist, item) diff --git a/channels/serietvu.json b/channels/serietvu.json index 16d2e1fe..a7612fde 100644 --- a/channels/serietvu.json +++ b/channels/serietvu.json @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -49,7 +49,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero de link da verificare", "default": 1, diff --git a/channels/serietvu.py b/channels/serietvu.py index 80fb13c9..b25a7bec 100644 --- a/channels/serietvu.py +++ b/channels/serietvu.py @@ -20,8 +20,8 @@ list_language = IDIOMAS.values() list_servers = ['speedvideo'] list_quality = ['default'] -# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) -# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) +# checklinks = config.get_setting('checklinks', __channel__) +# checklinks_number = config.get_setting('checklinks_number', __channel__) @@ -148,8 +148,8 @@ def findvideos(item): # itemlist = filtertools.get_links(itemlist, item, list_language) # Controlla se i link sono validi - # if __comprueba_enlaces__: - # itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + # if checklinks: + # itemlist = servertools.check_list_links(itemlist, checklinks_number) # # autoplay.start(itemlist, item) @@ -177,8 +177,8 @@ def findepisodevideo(item): # itemlist = filtertools.get_links(itemlist, item, list_language) # Controlla se i link sono validi - # if __comprueba_enlaces__: - # itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) + # if checklinks: + # itemlist = servertools.check_list_links(itemlist, checklinks_number) # # autoplay.start(itemlist, item) diff --git a/channels/tantifilm.json b/channels/tantifilm.json index e181261f..ceadbfe6 100644 --- a/channels/tantifilm.json +++ b/channels/tantifilm.json @@ -34,7 +34,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -42,7 +42,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero di link da verificare", "default": 1, diff --git a/channels/toonitalia.json b/channels/toonitalia.json index 23a3892b..1ba2b01d 100644 --- a/channels/toonitalia.json +++ b/channels/toonitalia.json @@ -33,7 +33,7 @@ "visible": true }, { - "id": "comprueba_enlaces", + "id": "checklinks", "type": "bool", "label": "Verifica se i link esistono", "default": false, @@ -41,7 +41,7 @@ "visible": true }, { - "id": "comprueba_enlaces_num", + "id": "checklinks_number", "type": "list", "label": "Numero di link da verificare", "default": 1, diff --git a/core/channeltools.py b/core/channeltools.py index d17fc86e..af001487 100644 --- a/core/channeltools.py +++ b/core/channeltools.py @@ -42,8 +42,7 @@ def get_channel_parameters(channel_name): channel_parameters["language"] = channel_parameters.get("language", ["all"]) channel_parameters["adult"] = channel_parameters.get("adult", False) channel_parameters["active"] = channel_parameters.get("active", False) - channel_parameters["include_in_global_search"] = channel_parameters.get("include_in_global_search", - False) + channel_parameters["include_in_global_search"] = channel_parameters.get("include_in_global_search", False) channel_parameters["categories"] = channel_parameters.get("categories", list()) channel_parameters["thumbnail"] = channel_parameters.get("thumbnail", "") @@ -87,8 +86,7 @@ def get_channel_parameters(channel_name): channel_parameters["include_in_global_search"] = True elif s['id'] == "filter_languages": channel_parameters["filter_languages"] = s.get('lvalues',[]) - elif not s['id'].startswith("include_in_") and \ - (s.get('enabled', False) or s.get('visible', False)): + elif s['id'].startswith("include_in_"): channel_parameters["has_settings"] = True del channel_parameters['settings'] diff --git a/core/support.py b/core/support.py index 9da6dacb..0da326ec 100644 --- a/core/support.py +++ b/core/support.py @@ -61,15 +61,7 @@ def hdpass_get_servers(item): url=url_decode(media_url))) log("video -> ", res_video) - __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', item.channel) - __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', item.channel) - - if __comprueba_enlaces__: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) - if xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks'): - itemlist = servertools.check_list_links(itemlist, xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks_number')) - - return itemlist + return controls(itemlist, item, AutoPlay, CheckLinks) def url_decode(url_enc): @@ -501,11 +493,6 @@ def nextPage(itemlist, item, data, patron, function_level=1): return itemlist def server(item, data='', headers='', AutoPlay=True, CheckLinks=True): - - __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', item.channel) - log(__comprueba_enlaces__ ) - __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', item.channel) - log(__comprueba_enlaces_num__ ) if not data: data = httptools.downloadpage(item.url, headers=headers).data @@ -520,14 +507,29 @@ def server(item, data='', headers='', AutoPlay=True, CheckLinks=True): videoitem.channel = item.channel videoitem.contentType = item.contentType - if __comprueba_enlaces__ and CheckLinks: - itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) - if xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks'): - itemlist = servertools.check_list_links(itemlist, xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks_number')) + return controls(itemlist, item, AutoPlay, CheckLinks) + +def controls(itemlist, item, AutoPlay=True, CheckLinks=True): + from core import jsontools + 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, {}) + settings_node = channel_node.get('settings', {}) + AP = get_setting('autoplay') or settings_node['active'] + if CL and not AP: + if get_setting('checklinks', item.channel): + checklinks = get_setting('checklinks', item.channel) + else: + checklinks = get_setting('checklinks') + if get_setting('checklinks_number', item.channel): + checklinks_number = get_setting('checklinks_number', item.channel) + else: + checklinks_number = get_setting('checklinks_number') + itemlist = servertools.check_list_links(itemlist, checklinks_number) if AutoPlay == True: autoplay.start(itemlist, item) - return itemlist