From 935ee7f954dd9979e80fe434c6ed003672708fb7 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 27 Jun 2020 20:22:29 +0200 Subject: [PATCH] impostazioni server preferiti - bloccati sotto autoplay --- core/servertools.py | 40 ++++++++++++++++---------------- platformcode/xbmc_config_menu.py | 7 ++++-- resources/settings.xml | 5 ++-- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/core/servertools.py b/core/servertools.py index ace9b2e6..09d6b513 100644 --- a/core/servertools.py +++ b/core/servertools.py @@ -536,35 +536,35 @@ def get_server_parameters(server): return dict_servers_parameters[server] -def get_server_json(server_name): - # logger.info("server_name=" + server_name) - try: - server_path = filetools.join(config.get_runtime_path(), "servers", server_name + ".json") - if not filetools.exists(server_path): - server_path = filetools.join(config.get_runtime_path(), "servers", "debriders", server_name + ".json") - - # logger.info("server_path=" + server_path) - server_json = jsontools.load(filetools.read(server_path)) - # logger.info("server_json= %s" % server_json) - - except Exception as ex: - template = "An exception of type %s occured. Arguments:\n%r" - message = template % (type(ex).__name__, ex.args) - logger.error(" %s" % message) - server_json = None - - return server_json +# def get_server_json(server_name): +# # logger.info("server_name=" + server_name) +# try: +# server_path = filetools.join(config.get_runtime_path(), "servers", server_name + ".json") +# if not filetools.exists(server_path): +# server_path = filetools.join(config.get_runtime_path(), "servers", "debriders", server_name + ".json") +# +# # logger.info("server_path=" + server_path) +# server_json = jsontools.load(filetools.read(server_path)) +# # logger.info("server_json= %s" % server_json) +# +# except Exception as ex: +# template = "An exception of type %s occured. Arguments:\n%r" +# message = template % (type(ex).__name__, ex.args) +# logger.error(" %s" % message) +# server_json = None +# +# return server_json def get_server_host(server_name): from core import scrapertools - return [scrapertools.get_domain_from_url(pattern['url']) for pattern in get_server_json(server_name)['find_videos']['patterns']] + return [scrapertools.get_domain_from_url(pattern['url']) for pattern in get_server_parameters(server_name)['find_videos']['patterns']] def get_server_controls_settings(server_name): dict_settings = {} - list_controls = get_server_json(server_name).get('settings', []) + list_controls = get_server_parameters(server_name).get('settings', []) import copy list_controls = copy.deepcopy(list_controls) diff --git a/platformcode/xbmc_config_menu.py b/platformcode/xbmc_config_menu.py index 3b6e548a..dfd7731e 100644 --- a/platformcode/xbmc_config_menu.py +++ b/platformcode/xbmc_config_menu.py @@ -184,7 +184,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): # The call is made from a channel self.list_controls, default_values = servertools.get_server_controls_settings(self.channel) self.kwargs = {"server": self.channel} - self.channelName = servertools.get_server_json(self.channel)['name'] + self.channelName = servertools.get_server_parameters(self.channel)['name'] # Else Exit else: @@ -225,6 +225,8 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): c["control"].setVisible(val) def evaluate_conditions(self): + import time + t = time.time() for c in self.list_controls: c["active"] = self.evaluate(self.list_controls.index(c), c["enabled"]) self.set_enabled(c, c["active"]) @@ -232,6 +234,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): if not c["show"]: self.set_visible(c, c["show"]) self.visible_controls = [c for c in self.list_controls if c["show"]] + logger.info(time.time()-t) def evaluate(self, index, cond): import re @@ -506,7 +509,7 @@ class SettingsWindow(xbmcgui.WindowXMLDialog): elif c["type"] == 'text': self.add_control_text(c) elif c["type"] == 'list': self.add_control_list(c) elif c["type"] == 'label': self.add_control_label(c) - + logger.info(time.time()-t) self.list_controls = [c for c in self.list_controls if "control" in c] self.evaluate_conditions() diff --git a/resources/settings.xml b/resources/settings.xml index 5429f5fc..4a45246d 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -20,6 +20,9 @@ + + + @@ -64,12 +67,10 @@ - -