diff --git a/core/servertools.py b/core/servertools.py index 37693b10..06180340 100644 --- a/core/servertools.py +++ b/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 diff --git a/core/support.py b/core/support.py index 70696ef9..d1c62eaa 100755 --- a/core/support.py +++ b/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))) diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py index 6534b9cf..470c3299 100644 --- a/platformcode/platformtools.py +++ b/platformcode/platformtools.py @@ -1053,7 +1053,7 @@ def resume_playback(item, return_played_time=False): if return_played_time: return item_nfo.played_time # Show Window - elif (config.get_setting("player_mode") not in [3] or item.play_from == 'window') and item_nfo.played_time: + elif (config.get_setting("player_mode") not in [3] or item.play_from == 'window') and item_nfo.played_time and item_nfo.played_time >= 120: Dialog = ResumePlayback('ResumePlayback.xml', config.get_runtime_path(), item=item_nfo) Dialog.show() t = 0 diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py index 15a73abe..2807262d 100644 --- a/platformcode/xbmc_videolibrary.py +++ b/platformcode/xbmc_videolibrary.py @@ -71,7 +71,7 @@ def mark_auto_as_watched(item, nfo_path=None, head_nfo=None, item_nfo=None): xbmc.sleep(1000) # Set played time - item_nfo.played_time = int(actual_time) if not marked and actual_time > 120 else 0 + item_nfo.played_time = int(actual_time) if not marked else 0 filetools.write(nfo_path, head_nfo + item_nfo.tojson()) # Silent sync with Trakt @@ -84,8 +84,8 @@ def mark_auto_as_watched(item, nfo_path=None, head_nfo=None, item_nfo=None): xbmc.executebuiltin('Action(Back)') xbmc.sleep(500) if next_episode and next_episode.next_ep: - from platformcode.launcher import play_from_library - return play_from_library(next_episode) + from platformcode.launcher import play_from_library + return play_from_library(next_episode) # If it is configured to mark as seen if config.get_setting("mark_as_watched", "videolibrary"): diff --git a/specials/autoplay.py b/specials/autoplay.py index 74832050..79e9c9a1 100644 --- a/specials/autoplay.py +++ b/specials/autoplay.py @@ -44,20 +44,16 @@ def start(itemlist, item): autoplay_list = [] autoplay_b = [] favorite_quality = [] - blacklisted_servers = [] favorite_servers = [] + blacklisted_servers = config.get_setting("black_list", server='servers') + if not blacklisted_servers: blacklisted_servers = [] from core import servertools servers_list = list(servertools.get_servers_list().items()) for server, server_parameters in servers_list: - if config.get_setting('black_list', server=server): - blacklisted_servers.append(server.lower()) if config.get_setting('favorites_servers_list', server=server): favorite_servers.append(server.lower()) - if not blacklisted_servers: - config.set_setting('black_list', [], server='servers') - blacklisted_servers = [] if not favorite_servers: config.set_setting('favorites_servers_list', [], server='servers') favorite_servers = []