Cutlery/whoogle-search
1
0
Fork 0
mirror of https://github.com/benbusby/whoogle-search.git synced 2025-07-31 15:08:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert changes to config vars from #1212

Browse Source 
Fixes #1214

Fixes #1216
This commit is contained in:
Ben Busby 2025-01-19 13:13:14 -07:00
parent 99ca67c90e
commit 50625f222f
No known key found for this signature in database
GPG Key ID: B9B7231E01D924A1
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/models/config.py
View File

@ -63,9 +63,9 @@ class Config:
] ]
app_config = current_app.config app_config = current_app.config
self.url = kwargs.get('url', '') self.url = os.getenv('WHOOGLE_CONFIG_URL', '')
self.lang_search = kwargs.get('lang_search', '') self.lang_search = os.getenv('WHOOGLE_CONFIG_SEARCH_LANGUAGE', '')
self.lang_interface = kwargs.get('lang_interface', '') self.lang_interface = os.getenv('WHOOGLE_CONFIG_LANGUAGE', '')
self.style_modified = os.getenv( self.style_modified = os.getenv(
'WHOOGLE_CONFIG_STYLE', '') 'WHOOGLE_CONFIG_STYLE', '')
self.block = os.getenv('WHOOGLE_CONFIG_BLOCK', '') self.block = os.getenv('WHOOGLE_CONFIG_BLOCK', '')
@ -73,16 +73,16 @@ class Config:
self.block_url = os.getenv('WHOOGLE_CONFIG_BLOCK_URL', '') self.block_url = os.getenv('WHOOGLE_CONFIG_BLOCK_URL', '')
self.country = os.getenv('WHOOGLE_CONFIG_COUNTRY', '') self.country = os.getenv('WHOOGLE_CONFIG_COUNTRY', '')
self.tbs = os.getenv('WHOOGLE_CONFIG_TIME_PERIOD', '') self.tbs = os.getenv('WHOOGLE_CONFIG_TIME_PERIOD', '')
self.theme = kwargs.get('theme', '') self.theme = os.getenv('WHOOGLE_CONFIG_THEME', 'system')
self.safe = kwargs.get('safe', '') self.safe = read_config_bool('WHOOGLE_CONFIG_SAFE')
self.dark = kwargs.get('dark', '') self.dark = read_config_bool('WHOOGLE_CONFIG_DARK') # deprecated
self.alts = kwargs.get('alts', '') self.alts = read_config_bool('WHOOGLE_CONFIG_ALTS')
self.nojs = kwargs.get('nojs', '') self.nojs = read_config_bool('WHOOGLE_CONFIG_NOJS')
self.tor = kwargs.get('tor', '') self.tor = read_config_bool('WHOOGLE_CONFIG_TOR')
self.near = kwargs.get('near', '') self.near = os.getenv('WHOOGLE_CONFIG_NEAR', '')
self.new_tab = kwargs.get('new_tab', '') self.new_tab = read_config_bool('WHOOGLE_CONFIG_NEW_TAB')
self.view_image = kwargs.get('view_image', '') self.view_image = read_config_bool('WHOOGLE_CONFIG_VIEW_IMAGE')
self.get_only = kwargs.get('get_only', '') self.get_only = read_config_bool('WHOOGLE_CONFIG_GET_ONLY')
self.anon_view = read_config_bool('WHOOGLE_CONFIG_ANON_VIEW') self.anon_view = read_config_bool('WHOOGLE_CONFIG_ANON_VIEW')
self.preferences_encrypted = read_config_bool('WHOOGLE_CONFIG_PREFERENCES_ENCRYPTED') self.preferences_encrypted = read_config_bool('WHOOGLE_CONFIG_PREFERENCES_ENCRYPTED')
self.preferences_key = os.getenv('WHOOGLE_CONFIG_PREFERENCES_KEY', '') self.preferences_key = os.getenv('WHOOGLE_CONFIG_PREFERENCES_KEY', '')
@ -203,7 +203,7 @@ class Config:
# if preferences leads to an empty dictionary it means preferences # if preferences leads to an empty dictionary it means preferences
# parameter was not decrypted successfully # parameter was not decrypted successfully
if len(params_new): if len(params_new):
params = params_new params = params_new
for param_key in params.keys(): for param_key in params.keys():
if not self.is_safe_key(param_key): if not self.is_safe_key(param_key):