From 7e78fbc16e9ab8c908b94523cc44513831ef0d1e Mon Sep 17 00:00:00 2001 From: shortcutme Date: Fri, 19 Apr 2019 02:37:27 +0200 Subject: [PATCH] Ignore invalid shared filters --- plugins/ContentFilter/ContentFilterPlugin.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/plugins/ContentFilter/ContentFilterPlugin.py b/plugins/ContentFilter/ContentFilterPlugin.py index 4c30a140..05f33376 100644 --- a/plugins/ContentFilter/ContentFilterPlugin.py +++ b/plugins/ContentFilter/ContentFilterPlugin.py @@ -145,7 +145,14 @@ class UiWebsocketPlugin(object): include_site = filter_storage.site_manager.get(include["address"]) if not include_site: continue - content = include_site.storage.loadJson(include["inner_path"]) + try: + content = include_site.storage.loadJson(include["inner_path"]) + include["error"] = None + except Exception as err: + if include_site.settings["own"]: + include_site.log.warning("Error loading filter %s: %s" % (include["inner_path"], err)) + content = {} + include["error"] = str(err) include["mutes"] = content.get("mutes", {}) include["siteblocks"] = content.get("siteblocks", {}) back.append(include)