open.source/whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Joao A. Candido Ramos 2021-04-14 23:09:46 +02:00 committed by GitHub
commit 86c6a6772e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/models/config.py
View File

@ -4,22 +4,31 @@ import os
class Config: class Config:
def __init__(self, **kwargs): def __init__(self, **kwargs):
def read_config_bool(var: str) -> bool:
val = os.getenv(var, '0')
if val.isdigit():
return bool(int(val))
return False
app_config = current_app.config app_config = current_app.config
self.url = os.getenv('WHOOGLE_CONFIG_URL', '') self.url = os.getenv('WHOOGLE_CONFIG_URL', '')
self.lang_search = os.getenv('WHOOGLE_CONFIG_LANGUAGE', '') self.lang_search = os.getenv('WHOOGLE_CONFIG_LANGUAGE', '')
self.lang_interface = os.getenv('WHOOGLE_CONFIG_LANGUAGE', '') self.lang_interface = os.getenv('WHOOGLE_CONFIG_LANGUAGE', '')
self.style = open(os.path.join(app_config['STATIC_FOLDER'], self.style = os.getenv(
'css/variables.css')).read() 'WHOOGLE_CONFIG_STYLE',
open(os.path.join(app_config['STATIC_FOLDER'],
'css/variables.css')).read())
self.ctry = os.getenv('WHOOGLE_CONFIG_COUNTRY', '') self.ctry = os.getenv('WHOOGLE_CONFIG_COUNTRY', '')
self.safe = bool(os.getenv('WHOOGLE_CONFIG_SAFE', False)) self.safe = read_config_bool('WHOOGLE_CONFIG_SAFE')
self.dark = bool(os.getenv('WHOOGLE_CONFIG_DARK', False)) self.dark = read_config_bool('WHOOGLE_CONFIG_DARK')
self.alts = bool(os.getenv('WHOOGLE_CONFIG_ALTS', False)) self.alts = read_config_bool('WHOOGLE_CONFIG_ALTS')
self.nojs = bool(os.getenv('WHOOGLE_CONFIG_NOJS', False)) self.nojs = read_config_bool('WHOOGLE_CONFIG_NOJS')
self.tor = bool(os.getenv('WHOOGLE_CONFIG_TOR', False)) self.tor = read_config_bool('WHOOGLE_CONFIG_TOR')
self.near = os.getenv('WHOOGLE_CONFIG_NEAR', '') self.near = os.getenv('WHOOGLE_CONFIG_NEAR', '')
self.new_tab = bool(os.getenv('WHOOGLE_CONFIG_NEW_TAB', False)) self.new_tab = read_config_bool('WHOOGLE_CONFIG_NEW_TAB')
self.view_image = bool(os.getenv('WHOOGLE_CONFIG_VIEW_IMAGE', False)) self.view_image = read_config_bool('WHOOGLE_CONFIG_VIEW_IMAGE')
self.get_only = bool(os.getenv('WHOOGLE_CONFIG_GET_ONLY', False)) self.get_only = read_config_bool('WHOOGLE_CONFIG_GET_ONLY')
self.safe_keys = [ self.safe_keys = [
'lang_search', 'lang_search',
'lang_interface', 'lang_interface',
@ -27,10 +36,13 @@ class Config:
'dark' 'dark'
] ]
for key, value in kwargs.items(): # Skip setting custom config if there isn't one
if not value: if kwargs:
continue for attr in self.get_mutable_attrs():
setattr(self, key, value) if attr not in kwargs.keys():
setattr(self, attr, '')
else:
setattr(self, attr, kwargs[attr])
def __getitem__(self, name): def __getitem__(self, name):
return getattr(self, name) return getattr(self, name)
@ -44,6 +56,11 @@ class Config:
def __contains__(self, name): def __contains__(self, name):
return hasattr(self, name) return hasattr(self, name)
def get_mutable_attrs(self):
return {name: attr for name, attr in self.__dict__.items()
if not name.startswith("__")
and (type(attr) is bool or type(attr) is str)}
def is_safe_key(self, key) -> bool: def is_safe_key(self, key) -> bool:
"""Establishes a group of config options that are safe to set """Establishes a group of config options that are safe to set
in the url. in the url.

2
test/conftest.py
View File

@ -5,7 +5,7 @@ import random
demo_config = { demo_config = {
'near': random.choice(['Seattle', 'New York', 'San Francisco']), 'near': random.choice(['Seattle', 'New York', 'San Francisco']),
'dark_mode': str(random.getrandbits(1)), 'dark': str(random.getrandbits(1)),
'nojs': str(random.getrandbits(1)), 'nojs': str(random.getrandbits(1)),
'lang_interface': random.choice(app.config['LANGUAGES'])['value'], 'lang_interface': random.choice(app.config['LANGUAGES'])['value'],
'lang_search': random.choice(app.config['LANGUAGES'])['value'], 'lang_search': random.choice(app.config['LANGUAGES'])['value'],