stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Check links in support

Browse Source
This commit is contained in:
Alhaziel
2019-05-25 16:00:13 +02:00
parent adc3b9efd5
commit 84dae6f6f4
51 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/altadefinizione01.json
+2 -2
View File
@@ -33,7 +33,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero di link da verificare", "label": "Numero di link da verificare",
"default": 1, "default": 1,
channels/altadefinizione01.py
+4 -4
View File
@@ -16,8 +16,8 @@ list_language = IDIOMAS.values()
list_servers = ['openload', 'streamango', 'rapidvideo', 'streamcherry', 'megadrive'] list_servers = ['openload', 'streamango', 'rapidvideo', 'streamcherry', 'megadrive']
list_quality = ['default'] list_quality = ['default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'altadefinizione01') checklinks = config.get_setting('checklinks', 'altadefinizione01')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'altadefinizione01') checklinks_number = config.get_setting('checklinks_number', 'altadefinizione01')
headers = [['Referer', host]] headers = [['Referer', host]]
blacklist_categorie = ['Altadefinizione01', 'Altadefinizione.to'] blacklist_categorie = ['Altadefinizione01', 'Altadefinizione.to']
@@ -147,8 +147,8 @@ def findvideos(item):
itemlist = support.server(item, headers=headers) itemlist = support.server(item, headers=headers)
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
channels/altadefinizione01_club.json
+2 -2
View File
@@ -44,7 +44,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": true, "default": true,
@@ -52,7 +52,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/altadefinizione01_club.py
+4 -4
View File
@@ -19,8 +19,8 @@ host = "https://www.altadefinizione01.vision/" #aggiornato al 30-04-209
# ======== Funzionalità ============================= # ======== Funzionalità =============================
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) checklinks = config.get_setting('checklinks', __channel__)
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __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'], headers = [['User-Agent', 'Mozilla/50.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Firefox/45.0'],
['Referer', host]] ['Referer', host]]
@@ -216,8 +216,8 @@ def findvideos(item):
logger.error("data doesn't contain expected URL") logger.error("data doesn't contain expected URL")
# Controlla se i link sono validi # Controlla se i link sono validi
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
itemlist = filtertools.get_links(itemlist, item, list_language) itemlist = filtertools.get_links(itemlist, item, list_language)
channels/altadefinizione01_link.json
+2 -2
View File
@@ -46,7 +46,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": true, "default": true,
@@ -54,7 +54,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/altadefinizione01_link.py
+4 -4
View File
@@ -22,8 +22,8 @@ host = "https://altadefinizione01.voto/" #aggiornato al 3 maggio 2019
# ======== def per utility INIZIO ============================ # ======== def per utility INIZIO ============================
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) checklinks = config.get_setting('checklinks', __channel__)
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __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'], 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']] ['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") logger.error("data doesn't contain expected URL")
# Controlla se i link sono validi # Controlla se i link sono validi
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
itemlist = filtertools.get_links(itemlist, item, list_language) itemlist = filtertools.get_links(itemlist, item, list_language)
channels/altadefinizioneclick.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/altadefinizioneclick.py
+4 -4
View File
@@ -17,8 +17,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'streamango', "vidoza", "thevideo", "okru", 'youtube'] list_servers = ['verystream', 'openload', 'streamango', "vidoza", "thevideo", "okru", 'youtube']
list_quality = ['1080p'] list_quality = ['1080p']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'altadefinizioneclick') checklinks = config.get_setting('checklinks', 'altadefinizioneclick')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'altadefinizioneclick') checklinks_number = config.get_setting('checklinks_number', 'altadefinizioneclick')
headers = [['Referer', host]] headers = [['Referer', host]]
@@ -98,8 +98,8 @@ def findvideos(item):
itemlist = support.hdpass_get_servers(item) itemlist = support.hdpass_get_servers(item)
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
channels/altadefinizionehd.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/animeleggendari.json
+2 -2
View File
@@ -33,7 +33,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/animeleggendari.py
+4 -4
View File
@@ -20,8 +20,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'streamango'] list_servers = ['verystream', 'openload', 'streamango']
list_quality = ['default'] list_quality = ['default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animeleggendari') checklinks = config.get_setting('checklinks', 'animeleggendari')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animeleggendari') checklinks_number = config.get_setting('checklinks_number', 'animeleggendari')
def mainlist(item): def mainlist(item):
log() log()
@@ -176,8 +176,8 @@ def findvideos(item):
itemlist = support.server(item,data) itemlist = support.server(item,data)
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
autoplay.start(itemlist, item) autoplay.start(itemlist, item)
channels/animesaturn.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/animesaturn.py
+4 -4
View File
@@ -22,8 +22,8 @@ list_language = IDIOMAS.values()
list_servers = ['openload','fembed'] list_servers = ['openload','fembed']
list_quality = ['default'] list_quality = ['default']
# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) # checklinks = config.get_setting('checklinks', __channel__)
# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) # checklinks_number = config.get_setting('checklinks_number', __channel__)
def mainlist(item): def mainlist(item):
@@ -263,8 +263,8 @@ def findvideos(item):
# Controlla se i link sono validi # Controlla se i link sono validi
# if __comprueba_enlaces__: # if checklinks:
# itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) # itemlist = servertools.check_list_links(itemlist, checklinks_number)
# #
# autoplay.start(itemlist, item) # autoplay.start(itemlist, item)
channels/animespace.json
+1 -1
View File
@@ -32,7 +32,7 @@
] ]
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Número de enlaces a verificar", "label": "Número de enlaces a verificar",
"default": 1, "default": 1,
channels/animespace.py
+4 -4
View File
@@ -17,8 +17,8 @@ from specials import renumbertools
host = "https://animespace.tv/" host = "https://animespace.tv/"
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animespace') checklinks = config.get_setting('checklinks', 'animespace')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animespace') checklinks_number = config.get_setting('checklinks_number', 'animespace')
IDIOMAS = {'VOSE': 'VOSE'} IDIOMAS = {'VOSE': 'VOSE'}
list_language = IDIOMAS.values() list_language = IDIOMAS.values()
@@ -240,8 +240,8 @@ def findvideos(item):
itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize()) itemlist = servertools.get_servers_itemlist(itemlist, lambda x: x.title % x.server.capitalize())
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/animeworld.json
+2 -2
View File
@@ -32,7 +32,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -40,7 +40,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/animeworld.py
+4 -4
View File
@@ -20,8 +20,8 @@ list_language = IDIOMAS.values()
list_servers = ['diretto'] list_servers = ['diretto']
list_quality = [] list_quality = []
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'animeworld') checklinks = config.get_setting('checklinks', 'animeworld')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'animeworld') checklinks_number = config.get_setting('checklinks_number', 'animeworld')
def mainlist(item): def mainlist(item):
@@ -398,8 +398,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/casacinema.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/casacinemaInfo.py
+4 -4
View File
@@ -15,8 +15,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'wstream', 'speedvideo'] list_servers = ['verystream', 'openload', 'wstream', 'speedvideo']
list_quality = ['1080p', '720', '480p', '360p'] list_quality = ['1080p', '720', '480p', '360p']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'casacinema') checklinks = config.get_setting('checklinks', 'casacinema')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'casacinema') checklinks_number = config.get_setting('checklinks_number', 'casacinema')
def mainlist(item): def mainlist(item):
@@ -142,8 +142,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para AutoPlay # Requerido para AutoPlay
channels/cineblog01.json
+2 -2
View File
@@ -33,7 +33,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero di link da verificare", "label": "Numero di link da verificare",
"default": 1, "default": 1,
channels/cineblog01.py
+4 -4
View File
@@ -27,8 +27,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'streamango', 'wstream'] list_servers = ['verystream', 'openload', 'streamango', 'wstream']
list_quality = ['HD', 'default'] list_quality = ['HD', 'default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cineblog01') checklinks = config.get_setting('checklinks', 'cineblog01')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'cineblog01') checklinks_number = config.get_setting('checklinks_number', 'cineblog01')
# esclusione degli articoli 'di servizio' # esclusione degli articoli 'di servizio'
blacklist = ['BENVENUTI', 'Richieste Serie TV', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE ', blacklist = ['BENVENUTI', 'Richieste Serie TV', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE ',
@@ -280,8 +280,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/cinemalibero.json
+2 -2
View File
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -57,7 +57,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/cinemalibero.py
+4 -4
View File
@@ -19,8 +19,8 @@ list_servers = ['akstream', 'wstream', 'openload', 'streamango']
list_quality = ['default'] list_quality = ['default']
# Necessario per Verifica Link # Necessario per Verifica Link
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'cinemalibero') checklinks = config.get_setting('checklinks', 'cinemalibero')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'cinemalibero') checklinks_number = config.get_setting('checklinks_number', 'cinemalibero')
host = 'https://www.cinemalibero.icu' 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)) action='add_pelicula_to_library', extra='findservers', contentTitle=item.contentTitle))
# Necessario per filtrare i Link # Necessario per filtrare i Link
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Necessario per FilterTools # Necessario per FilterTools
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
channels/cinemastreaming.json
+2 -2
View File
@@ -42,7 +42,7 @@
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -50,7 +50,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/eurostreaming.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": true, "default": true,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/eurostreaming.py
+2 -2
View File
@@ -30,8 +30,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload'] list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload']
list_quality = ['default'] list_quality = ['default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'eurostreaming') checklinks = config.get_setting('checklinks', 'eurostreaming')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'eurostreaming') checklinks_number = config.get_setting('checklinks_number', 'eurostreaming')
def mainlist(item): def mainlist(item):
support.log() support.log()
channels/fastsubita.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/fastsubita.py
+4 -4
View File
@@ -18,8 +18,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'speedvideo', 'wstream', 'flashx', 'vidoza', 'vidtome'] list_servers = ['verystream', 'openload', 'speedvideo', 'wstream', 'flashx', 'vidoza', 'vidtome']
list_quality = ['default'] list_quality = ['default']
# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'fastsubita') # checklinks = config.get_setting('checklinks', 'fastsubita')
# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'fastsubita') # checklinks_number = config.get_setting('checklinks_number', 'fastsubita')
headers = [ headers = [
['Host', 'fastsubita.com'], ['Host', 'fastsubita.com'],
@@ -277,8 +277,8 @@ def findvideos(item):
# #
# # Requerido para Filtrar enlaces # # Requerido para Filtrar enlaces
# #
# if __comprueba_enlaces__: # if checklinks:
# itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) # itemlist = servertools.check_list_links(itemlist, checklinks_number)
# #
# # Requerido para FilterTools # # Requerido para FilterTools
# #
channels/filmigratis.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/filmigratis.py
+2 -2
View File
@@ -18,8 +18,8 @@ list_language = IDIOMAS.values()
list_servers = ['openload', 'streamango', 'vidoza', 'okru'] list_servers = ['openload', 'streamango', 'vidoza', 'okru']
list_quality = ['1080p', '720p', '480p', '360'] list_quality = ['1080p', '720p', '480p', '360']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmigratis') checklinks = config.get_setting('checklinks', 'filmigratis')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmigratis') checklinks_number = config.get_setting('checklinks_number', 'filmigratis')
headers = [['Referer', host]] headers = [['Referer', host]]
channels/filmsenzalimiti.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/filmsenzalimiti.py
+4 -4
View File
@@ -19,8 +19,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'streamango', 'vidoza', 'okru'] list_servers = ['verystream', 'openload', 'streamango', 'vidoza', 'okru']
list_quality = ['1080p', '720p', '480p', '360'] list_quality = ['1080p', '720p', '480p', '360']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmsenzalimiti') checklinks = config.get_setting('checklinks', 'filmsenzalimiti')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmsenzalimiti') checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiti')
headers = [['Referer', host]] headers = [['Referer', host]]
@@ -174,8 +174,8 @@ def findvideos(item):
action="add_pelicula_to_library", extra="findservers", contentTitle=item.contentTitle)) action="add_pelicula_to_library", extra="findservers", contentTitle=item.contentTitle))
#Necessario per filtrare i Link #Necessario per filtrare i Link
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Necessario per FilterTools # Necessario per FilterTools
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
channels/filmsenzalimiticc.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/filmsenzalimiticc.py
+4 -4
View File
@@ -22,8 +22,8 @@ list_servers = ['verystream', 'openload', 'vidlox', 'youtube']
list_quality = ['default'] list_quality = ['default']
# Necessario per Verifica Link # Necessario per Verifica Link
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmsenzalimiticc') checklinks = config.get_setting('checklinks', 'filmsenzalimiticc')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmsenzalimiticc') checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiticc')
host = 'https://filmsenzalimiti.pw' 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)) action='add_pelicula_to_library', extra='findservers', contentTitle=item.contentTitle))
# Necessario per filtrare i Link # Necessario per filtrare i Link
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Necessario per FilterTools # Necessario per FilterTools
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
channels/ilgeniodellostreaming.json
+2 -2
View File
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -57,7 +57,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/ilgeniodellostreaming.py
+4 -4
View File
@@ -22,8 +22,8 @@ list_servers = ['verystream', 'openload', 'streamango', 'youtube']
list_quality = ['default'] list_quality = ['default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'ilgeniodellostreaming') checklinks = config.get_setting('checklinks', 'ilgeniodellostreaming')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'ilgeniodellostreaming') checklinks_number = config.get_setting('checklinks_number', 'ilgeniodellostreaming')
headers = [['Referer', host]] headers = [['Referer', host]]
@@ -372,8 +372,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/italiafilmhd.json
+2 -2
View File
@@ -34,7 +34,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -42,7 +42,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero di link da verificare", "label": "Numero di link da verificare",
"default": 1, "default": 1,
channels/italiafilmhd.py
+4 -4
View File
@@ -17,8 +17,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'youtube'] list_servers = ['verystream', 'openload', 'youtube']
list_quality = ['default'] list_quality = ['default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'italiafilmhd') checklinks = config.get_setting('checklinks', 'italiafilmhd')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'italiafilmhd') checklinks_number = config.get_setting('checklinks_number', 'italiafilmhd')
host = "https://italiafilm.network" host = "https://italiafilm.network"
@@ -296,8 +296,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/mondoserietv.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/mondoserietv.py
+4 -4
View File
@@ -19,8 +19,8 @@ list_language = IDIOMAS.values()
list_servers = ['akstream'] list_servers = ['akstream']
list_quality = ['default'] list_quality = ['default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'mondoserietv') checklinks = config.get_setting('checklinks', 'mondoserietv')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'mondoserietv') checklinks_number = config.get_setting('checklinks_number', 'mondoserietv')
headers = {'Referer': host} headers = {'Referer': host}
@@ -308,8 +308,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/piratestreaming.py
+4 -4
View File
@@ -24,8 +24,8 @@ list_servers = ['speedvideo', 'openload', 'youtube']
list_quality = ['default'] list_quality = ['default']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'piratestreaming') checklinks = config.get_setting('checklinks', 'piratestreaming')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'piratestreaming') checklinks_number = config.get_setting('checklinks_number', 'piratestreaming')
headers = [['Referer', host]] headers = [['Referer', host]]
@@ -243,8 +243,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/seriehd.json
+2 -2
View File
@@ -33,7 +33,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/seriehd.py
+4 -4
View File
@@ -18,8 +18,8 @@ list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'streamango', 'thevideome'] list_servers = ['verystream', 'openload', 'streamango', 'thevideome']
list_quality = ['1080p', '720p', '480p', '360'] list_quality = ['1080p', '720p', '480p', '360']
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'seriehd') checklinks = config.get_setting('checklinks', 'seriehd')
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'seriehd') checklinks_number = config.get_setting('checklinks_number', 'seriehd')
headers = [['Referer', host]] headers = [['Referer', host]]
@@ -137,8 +137,8 @@ def findvideos(item):
# Requerido para Filtrar enlaces # Requerido para Filtrar enlaces
if __comprueba_enlaces__: if checklinks:
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) itemlist = servertools.check_list_links(itemlist, checklinks_number)
# Requerido para FilterTools # Requerido para FilterTools
channels/serietvsubita.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/serietvsubita.py
+4 -4
View File
@@ -21,8 +21,8 @@ list_language = IDIOMAS.values()
list_servers = ['gounlimited','verystream','streamango','openload'] list_servers = ['gounlimited','verystream','streamango','openload']
list_quality = ['default'] list_quality = ['default']
# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) # checklinks = config.get_setting('checklinks', __channel__)
# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) # checklinks_number = config.get_setting('checklinks_number', __channel__)
def mainlist(item): def mainlist(item):
@@ -264,8 +264,8 @@ def findvideos(item):
# Controlla se i link sono validi # Controlla se i link sono validi
# if __comprueba_enlaces__: # if checklinks:
# itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) # itemlist = servertools.check_list_links(itemlist, checklinks_number)
# #
# autoplay.start(itemlist, item) # autoplay.start(itemlist, item)
channels/serietvu.json
+2 -2
View File
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -49,7 +49,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero de link da verificare", "label": "Numero de link da verificare",
"default": 1, "default": 1,
channels/serietvu.py
+6 -6
View File
@@ -20,8 +20,8 @@ list_language = IDIOMAS.values()
list_servers = ['speedvideo'] list_servers = ['speedvideo']
list_quality = ['default'] list_quality = ['default']
# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__) # checklinks = config.get_setting('checklinks', __channel__)
# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', __channel__) # checklinks_number = config.get_setting('checklinks_number', __channel__)
@@ -148,8 +148,8 @@ def findvideos(item):
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
# Controlla se i link sono validi # Controlla se i link sono validi
# if __comprueba_enlaces__: # if checklinks:
# itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) # itemlist = servertools.check_list_links(itemlist, checklinks_number)
# #
# autoplay.start(itemlist, item) # autoplay.start(itemlist, item)
@@ -177,8 +177,8 @@ def findepisodevideo(item):
# itemlist = filtertools.get_links(itemlist, item, list_language) # itemlist = filtertools.get_links(itemlist, item, list_language)
# Controlla se i link sono validi # Controlla se i link sono validi
# if __comprueba_enlaces__: # if checklinks:
# itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__) # itemlist = servertools.check_list_links(itemlist, checklinks_number)
# #
# autoplay.start(itemlist, item) # autoplay.start(itemlist, item)
channels/tantifilm.json
+2 -2
View File
@@ -34,7 +34,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -42,7 +42,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero di link da verificare", "label": "Numero di link da verificare",
"default": 1, "default": 1,
channels/toonitalia.json
+2 -2
View File
@@ -33,7 +33,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces", "id": "checklinks",
"type": "bool", "type": "bool",
"label": "Verifica se i link esistono", "label": "Verifica se i link esistono",
"default": false, "default": false,
@@ -41,7 +41,7 @@
"visible": true "visible": true
}, },
{ {
"id": "comprueba_enlaces_num", "id": "checklinks_number",
"type": "list", "type": "list",
"label": "Numero di link da verificare", "label": "Numero di link da verificare",
"default": 1, "default": 1,
core/channeltools.py
+2 -4
View File
@@ -42,8 +42,7 @@ def get_channel_parameters(channel_name):
channel_parameters["language"] = channel_parameters.get("language", ["all"]) channel_parameters["language"] = channel_parameters.get("language", ["all"])
channel_parameters["adult"] = channel_parameters.get("adult", False) channel_parameters["adult"] = channel_parameters.get("adult", False)
channel_parameters["active"] = channel_parameters.get("active", False) channel_parameters["active"] = channel_parameters.get("active", False)
channel_parameters["include_in_global_search"] = channel_parameters.get("include_in_global_search", channel_parameters["include_in_global_search"] = channel_parameters.get("include_in_global_search", False)
False)
channel_parameters["categories"] = channel_parameters.get("categories", list()) channel_parameters["categories"] = channel_parameters.get("categories", list())
channel_parameters["thumbnail"] = channel_parameters.get("thumbnail", "") channel_parameters["thumbnail"] = channel_parameters.get("thumbnail", "")
@@ -87,8 +86,7 @@ def get_channel_parameters(channel_name):
channel_parameters["include_in_global_search"] = True channel_parameters["include_in_global_search"] = True
elif s['id'] == "filter_languages": elif s['id'] == "filter_languages":
channel_parameters["filter_languages"] = s.get('lvalues',[]) channel_parameters["filter_languages"] = s.get('lvalues',[])
elif not s['id'].startswith("include_in_") and \ elif s['id'].startswith("include_in_"):
(s.get('enabled', False) or s.get('visible', False)):
channel_parameters["has_settings"] = True channel_parameters["has_settings"] = True
del channel_parameters['settings'] del channel_parameters['settings']
core/support.py
+21 -19
View File
@@ -61,15 +61,7 @@ def hdpass_get_servers(item):
url=url_decode(media_url))) url=url_decode(media_url)))
log("video -> ", res_video) log("video -> ", res_video)
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', item.channel) return controls(itemlist, item, AutoPlay, CheckLinks)
__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
def url_decode(url_enc): def url_decode(url_enc):
@@ -501,11 +493,6 @@ def nextPage(itemlist, item, data, patron, function_level=1):
return itemlist return itemlist
def server(item, data='', headers='', AutoPlay=True, CheckLinks=True): 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: if not data:
data = httptools.downloadpage(item.url, headers=headers).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.channel = item.channel
videoitem.contentType = item.contentType videoitem.contentType = item.contentType
if __comprueba_enlaces__ and CheckLinks: return controls(itemlist, item, AutoPlay, CheckLinks)
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
if xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks'): def controls(itemlist, item, AutoPlay=True, CheckLinks=True):
itemlist = servertools.check_list_links(itemlist, xbmcaddon.Addon('plugin.video.kod').getSetting('checklinks_number')) 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: if AutoPlay == True:
autoplay.start(itemlist, item) autoplay.start(itemlist, item)
return itemlist return itemlist