jandieman
/
searxng
mirror of https://github.com/searxng/searxng.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[refactor] stop SwitchableSetting from subclassing Setting 

Previously the default_value was abused for the cookie name.
Having SwitchableSetting subclass Setting doesn't even make sense
in the first place since none of the Setting methods apply.
This commit is contained in:
Martin Fischer 2022-01-04 14:57:39 +01:00
parent 83f8a8fc6d
commit 56fbf22108
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
searx/preferences.py
View File

@ -207,11 +207,12 @@ class Choice:
id: str id: str
class SwitchableSetting(Setting): class SwitchableSetting:
"""Base class for settings that can be turned on && off""" """Base class for settings that can be turned on && off"""
def __init__(self, default_value, locked: bool, choices: Iterable[Choice]): def __init__(self, name: str, locked: bool, choices: Iterable[Choice]):
super().__init__(default_value, locked) self.name = name
self.locked = locked
self.choices = choices self.choices = choices
self.enabled: Set[str] = set() self.enabled: Set[str] = set()
self.disabled: Set[str] = set() self.disabled: Set[str] = set()
@ -245,10 +246,10 @@ class SwitchableSetting(Setting):
if choice.id not in items: if choice.id not in items:
self.enabled.add(choice.id) self.enabled.add(choice.id)
def save(self, resp: flask.Response): # pylint: disable=arguments-differ def save(self, resp: flask.Response):
"""Save cookie in the HTTP reponse obect""" """Save cookie in the HTTP reponse obect"""
resp.set_cookie('disabled_{0}'.format(self.value), ','.join(self.disabled), max_age=COOKIE_MAX_AGE) resp.set_cookie('disabled_{0}'.format(self.name), ','.join(self.disabled), max_age=COOKIE_MAX_AGE)
resp.set_cookie('enabled_{0}'.format(self.value), ','.join(self.enabled), max_age=COOKIE_MAX_AGE) resp.set_cookie('enabled_{0}'.format(self.name), ','.join(self.enabled), max_age=COOKIE_MAX_AGE)
def get_disabled(self): def get_disabled(self):
disabled = self.disabled disabled = self.disabled