From 9e53470b4cf533b890a2f57debd2f2b4198b4dd1 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sun, 27 Dec 2020 14:39:48 +0100
Subject: [mod] get rid of searx/brand.py

Removes module searx/brand.py and creates a namespace at searx.brand.

This patch is a first 'proof of concept'.  Later we can decide to remove the
brand namespace entirely or not.

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 searx/__init__.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

(limited to 'searx/__init__.py')

diff --git a/searx/__init__.py b/searx/__init__.py
index 08e67f69d..7f76022e1 100644
--- a/searx/__init__.py
+++ b/searx/__init__.py
@@ -60,3 +60,49 @@ if 'SEARX_SECRET' in environ:
     settings['server']['secret_key'] = environ['SEARX_SECRET']
 if 'SEARX_BIND_ADDRESS' in environ:
     settings['server']['bind_address'] = environ['SEARX_BIND_ADDRESS']
+
+
+class _brand_namespace:
+
+    @classmethod
+    def get_val(cls, group, name, default=''):
+        return settings[group].get(name, False) or ''
+
+    @property
+    def SEARX_URL(self):
+        return self.get_val('server', 'base_url')
+
+    @property
+    def GIT_URL(self):
+        return self.get_val('general', 'git_url')
+
+    @property
+    def GIT_BRANCH(self):
+        return self.get_val('general', 'git_branch')
+
+    @property
+    def ISSUE_URL(self):
+        return self.get_val('general', 'issue_url')
+
+    @property
+    def DOCS_URL(self):
+        return self.get_val('general', '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')
+
+    @property
+    def WIKI_URL(self):
+        return self.get_val('general', 'wiki_url')
+
+    @property
+    def TWITTER_URL(self):
+        return self.get_val('general', 'twitter_url')
+
+
+brand = _brand_namespace()
-- 
cgit v1.2.3


From 424e6abc7e26c3e3be71678d00f88cf09d6c0a7e Mon Sep 17 00:00:00 2001
From: Alexandre Flament <alex@al-f.net>
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