corretto autplay blacklist / server blacklist
This commit is contained in:
+1
-3
@@ -1127,8 +1127,6 @@ def pagination(itemlist, item, page, perpage, function_level=1):
|
|||||||
|
|
||||||
def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, Download=True, patronTag=None, Videolibrary=True):
|
def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, Download=True, patronTag=None, Videolibrary=True):
|
||||||
logger.debug()
|
logger.debug()
|
||||||
blacklisted_servers = config.get_setting("black_list", server='servers')
|
|
||||||
if not blacklisted_servers: blacklisted_servers = []
|
|
||||||
if not data and not itemlist:
|
if not data and not itemlist:
|
||||||
data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
|
data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
|
||||||
if data:
|
if data:
|
||||||
@@ -1174,7 +1172,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
|
|||||||
with futures.ThreadPoolExecutor() as executor:
|
with futures.ThreadPoolExecutor() as executor:
|
||||||
thL = [executor.submit(getItem, videoitem) for videoitem in itemlist if videoitem.url]
|
thL = [executor.submit(getItem, videoitem) for videoitem in itemlist if videoitem.url]
|
||||||
for it in futures.as_completed(thL):
|
for it in futures.as_completed(thL):
|
||||||
if it.result() and it.result().server.lower() not in blacklisted_servers:
|
if it.result() and not config.get_setting("black_list", server=it.result().server.lower()):
|
||||||
verifiedItemlist.append(it.result())
|
verifiedItemlist.append(it.result())
|
||||||
try:
|
try:
|
||||||
verifiedItemlist.sort(key=lambda it: int(re.sub(r'\D','',it.quality)))
|
verifiedItemlist.sort(key=lambda it: int(re.sub(r'\D','',it.quality)))
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
# Logger (kodi)
|
# Logger (kodi)
|
||||||
# --------------------------------------------------------------------------------
|
# --------------------------------------------------------------------------------
|
||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
import inspect, os, xbmc, sys
|
import inspect,os, xbmc, sys
|
||||||
from platformcode import config
|
from platformcode import config
|
||||||
|
|
||||||
# for test suite
|
# for test suite
|
||||||
|
|||||||
@@ -269,11 +269,9 @@ def cb_servers_blacklist(dict_values):
|
|||||||
n = len(dict_values)
|
n = len(dict_values)
|
||||||
i = 1
|
i = 1
|
||||||
for k, v in list(dict_values.items()):
|
for k, v in list(dict_values.items()):
|
||||||
config.set_setting("black_list", v, server=k)
|
|
||||||
if v: # If the server is blacklisted it cannot be in the favorites list
|
if v: # If the server is blacklisted it cannot be in the favorites list
|
||||||
config.set_setting("favorites_servers_list", 0, server=k)
|
config.set_setting("favorites_servers_list", 0, server=k)
|
||||||
blaklisted.append(k)
|
blaklisted.append(k)
|
||||||
f = True
|
|
||||||
progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % k)
|
progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % k)
|
||||||
i += 1
|
i += 1
|
||||||
config.set_setting("black_list", blaklisted, server='servers')
|
config.set_setting("black_list", blaklisted, server='servers')
|
||||||
|
|||||||
Reference in New Issue
Block a user