From 424e6abc7e26c3e3be71678d00f88cf09d6c0a7e Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 11 Jan 2021 11:49:06 +0100 Subject: [mod] settings.yml: move brand settings to a dedicated section --- searx/__init__.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'searx/__init__.py') diff --git a/searx/__init__.py b/searx/__init__.py index 7f76022e1..11adbba73 100644 --- a/searx/__init__.py +++ b/searx/__init__.py @@ -66,43 +66,43 @@ class _brand_namespace: @classmethod def get_val(cls, group, name, default=''): - return settings[group].get(name, False) or '' + return settings.get(group, {}).get(name) or default @property def SEARX_URL(self): return self.get_val('server', 'base_url') + @property + def CONTACT_URL(self): + return self.get_val('general', 'contact_url') + @property def GIT_URL(self): - return self.get_val('general', 'git_url') + return self.get_val('brand', 'git_url') @property def GIT_BRANCH(self): - return self.get_val('general', 'git_branch') + return self.get_val('brand', 'git_branch') @property def ISSUE_URL(self): - return self.get_val('general', 'issue_url') + return self.get_val('brand', 'issue_url') @property def DOCS_URL(self): - return self.get_val('general', 'docs_url') + return self.get_val('brand', 'docs_url') @property def PUBLIC_INSTANCES(self): - return self.get_val('general', 'public_instances') - - @property - def CONTACT_URL(self): - return self.get_val('general', 'contact_url') + return self.get_val('brand', 'public_instances') @property def WIKI_URL(self): - return self.get_val('general', 'wiki_url') + return self.get_val('brand', 'wiki_url') @property def TWITTER_URL(self): - return self.get_val('general', 'twitter_url') + return self.get_val('brand', 'twitter_url') brand = _brand_namespace() -- cgit v1.2.3