Fix e migliorie Server bloccati

core/servertools.py

@@ -148,26 +148,13 @@ def findvideos(data, skip=False):
     devuelve = []
     skip = int(skip)
     servers_list = list(get_servers_list().keys())
-
-
-    # is_filter_servers = False
-
     # Run findvideos on each active server
     for serverid in servers_list:
-        '''if not is_server_enabled(serverid):
-            continue'''
-        if config.get_setting('servers_blacklist') and serverid not in config.get_setting("black_list", server='servers'):
-        # if config.get_setting("filter_servers") == True and config.get_setting("black_list", server=serverid):
-        #     is_filter_servers = True
-            continue
-        devuelve.extend(findvideosbyserver(data, serverid))
-        if skip and len(devuelve) >= skip:
-            devuelve = devuelve[:skip]
-            break
-    # if config.get_setting("filter_servers") == False:  is_filter_servers = False
-    # logger.log('DEVUELVE: ' + str(devuelve))
-    # if not devuelve and is_filter_servers:
-    #     platformtools.dialog_ok(config.get_localized_string(60000), config.get_localized_string(60001))
+        if is_server_enabled(serverid) :
+            devuelve.extend(findvideosbyserver(data, serverid))
+            if skip and len(devuelve) >= skip:
+                devuelve = devuelve[:skip]
+                break
     return devuelve
 
 
@@ -710,9 +697,9 @@ def sort_servers(servers_list):
     """
     if servers_list and config.get_setting('favorites_servers'):
         if isinstance(servers_list[0], Item):
-            servers_list = sorted(servers_list, key=lambda x: config.get_setting("favorites_servers_list", server=x.server) or 100)
+            servers_list = sorted(servers_list, key=lambda x: config.get_setting("favorites_servers_list", server=x.server))
         else:
-            servers_list = sorted(servers_list, key=lambda x: config.get_setting("favorites_servers_list", server=x) or 100)
+            servers_list = sorted(servers_list, key=lambda x: config.get_setting("favorites_servers_list", server=x))
 
     return servers_list
 

core/support.py

@@ -1155,6 +1155,8 @@ 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):
     log()
+    blacklisted_servers = config.get_setting("black_list", server='servers')
+    if not blacklisted_servers: blacklisted_servers = []
     if not data and not itemlist:
         data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data
     if data:
@@ -1199,7 +1201,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
     with futures.ThreadPoolExecutor() as executor:
         thL = [executor.submit(getItem, videoitem) for videoitem in itemlist if videoitem.url]
         for it in futures.as_completed(thL):
-            if it.result():
+            if it.result() and it.result().server.lower() not in blacklisted_servers:
                 verifiedItemlist.append(it.result())
     try:
         verifiedItemlist.sort(key=lambda it: int(re.sub(r'\D','',it.quality)))