From 9485179064b4eb28f2813eba3c295edca3b0db7f Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 21 Dec 2020 00:37:45 +0100 Subject: [mod] move brand options from Makefile to settings.yml Signed-off-by: Markus Heiser --- utils/brand.env | 4 +++- utils/build_env.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 utils/build_env.py (limited to 'utils') diff --git a/utils/brand.env b/utils/brand.env index 2e763159d..2136d278f 100644 --- a/utils/brand.env +++ b/utils/brand.env @@ -1,7 +1,9 @@ +export SEARX_URL='' export GIT_URL='https://github.com/searx/searx' export GIT_BRANCH='master' export ISSUE_URL='https://github.com/searx/searx/issues' -export SEARX_URL='https://searx.me' export DOCS_URL='https://searx.github.io/searx' export PUBLIC_INSTANCES='https://searx.space' export CONTACT_URL='' +export WIKI_URL='https://github.com/searx/searx/wiki' +export TWITTER_URL='https://twitter.com/Searx_engine' diff --git a/utils/build_env.py b/utils/build_env.py new file mode 100644 index 000000000..0a210e8de --- /dev/null +++ b/utils/build_env.py @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later +"""build environment used by shell scripts +""" + +# set path +import sys +from os.path import realpath, dirname, join, sep +repo_root = realpath(dirname(realpath(__file__)) + sep + '..') +sys.path.insert(0, repo_root) + +from searx.settings_loader import load_settings + +settings, settings_load_message = load_settings() +print(settings_load_message) + +brand_env = 'utils' + sep + 'brand.env' +brand_py = 'searx' + sep + 'brand.py' + +def get_val(group, name, default=''): + return settings[group].get(name, False) or '' + +name_val = [ + ('SEARX_URL' , get_val('server', 'base_url')), + ('GIT_URL' , get_val('general','git_url')), + ('GIT_BRANCH' , get_val('general','git_branch')), + ('ISSUE_URL' , get_val('general','issue_url')), + ('DOCS_URL' , get_val('general','docs_url')), + ('PUBLIC_INSTANCES' , get_val('general','public_instances')), + ('CONTACT_URL' , get_val('general','contact_url')), + ('WIKI_URL' , get_val('general','wiki_url')), + ('TWITTER_URL' , get_val('general','twitter_url')), +] + +print('build %s' % brand_env) +with open(repo_root + sep + brand_env, 'w', encoding='utf-8') as f: + for name, val in name_val: + print("export %s='%s'" % (name, val), file=f) + +print('build %s' % brand_py) +with open(repo_root + sep + brand_py, 'w', encoding='utf-8') as f: + for name, val in name_val: + print("%s = '%s'" % (name, val), file=f) -- cgit v1.2.3 From 9e53470b4cf533b890a2f57debd2f2b4198b4dd1 Mon Sep 17 00:00:00 2001 From: Markus Heiser 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 --- utils/build_env.py | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'utils') diff --git a/utils/build_env.py b/utils/build_env.py index 0a210e8de..e7077dece 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -8,35 +8,23 @@ from os.path import realpath, dirname, join, sep repo_root = realpath(dirname(realpath(__file__)) + sep + '..') sys.path.insert(0, repo_root) -from searx.settings_loader import load_settings - -settings, settings_load_message = load_settings() -print(settings_load_message) - -brand_env = 'utils' + sep + 'brand.env' -brand_py = 'searx' + sep + 'brand.py' - -def get_val(group, name, default=''): - return settings[group].get(name, False) or '' +from searx import brand name_val = [ - ('SEARX_URL' , get_val('server', 'base_url')), - ('GIT_URL' , get_val('general','git_url')), - ('GIT_BRANCH' , get_val('general','git_branch')), - ('ISSUE_URL' , get_val('general','issue_url')), - ('DOCS_URL' , get_val('general','docs_url')), - ('PUBLIC_INSTANCES' , get_val('general','public_instances')), - ('CONTACT_URL' , get_val('general','contact_url')), - ('WIKI_URL' , get_val('general','wiki_url')), - ('TWITTER_URL' , get_val('general','twitter_url')), + ('SEARX_URL' , brand.SEARX_URL), + ('GIT_URL' , brand.GIT_URL), + ('GIT_BRANCH' , brand.GIT_BRANCH), + ('ISSUE_URL' , brand.ISSUE_URL), + ('DOCS_URL' , brand.DOCS_URL), + ('PUBLIC_INSTANCES' , brand.PUBLIC_INSTANCES), + ('CONTACT_URL' , brand.CONTACT_URL), + ('WIKI_URL' , brand.WIKI_URL), + ('TWITTER_URL' , brand.TWITTER_URL), ] +brand_env = 'utils' + sep + 'brand.env' + print('build %s' % brand_env) with open(repo_root + sep + brand_env, 'w', encoding='utf-8') as f: for name, val in name_val: print("export %s='%s'" % (name, val), file=f) - -print('build %s' % brand_py) -with open(repo_root + sep + brand_py, 'w', encoding='utf-8') as f: - for name, val in name_val: - print("%s = '%s'" % (name, val), file=f) -- cgit v1.2.3 From a31cb68668f2c5b890dc973aeeb90ef2246099aa Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Mon, 11 Jan 2021 22:56:15 +0100 Subject: [fix] utils/build_env.py: make sure to always use searx/settings.yml ignore SEARX_SETTINGS_PATH [1] https://github.com/searx/searx/pull/2408#pullrequestreview-565247895 Suggested-by: @dalf [1] Signed-off-by: Markus Heiser --- utils/build_env.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/build_env.py b/utils/build_env.py index e7077dece..b99e457cf 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -4,10 +4,17 @@ # set path import sys -from os.path import realpath, dirname, join, sep +import os +from os.path import realpath, dirname, join, sep, abspath + repo_root = realpath(dirname(realpath(__file__)) + sep + '..') sys.path.insert(0, repo_root) +# Under the assumption that a brand is always a fork assure that the settings +# file from reposetorie's working tree is used to generate the build_env, not +# from /etc/searx/settings.yml. +os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + sep + 'settings.yml') + from searx import brand name_val = [ -- cgit v1.2.3 From d5882147e0a56303e5a324e2afad5297727d0048 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Mon, 11 Jan 2021 11:48:16 +0100 Subject: [fix] utils/build_env.py: make sure to always use searx/settings.yml ignore SEARX_SETTINGS_PATH --- utils/build_env.py | 1 + 1 file changed, 1 insertion(+) (limited to 'utils') diff --git a/utils/build_env.py b/utils/build_env.py index b99e457cf..ffb2689e9 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -9,6 +9,7 @@ from os.path import realpath, dirname, join, sep, abspath repo_root = realpath(dirname(realpath(__file__)) + sep + '..') sys.path.insert(0, repo_root) +os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + '/settings.yml') # Under the assumption that a brand is always a fork assure that the settings # file from reposetorie's working tree is used to generate the build_env, not -- cgit v1.2.3