YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

form: rename _prevalidate() to _value_pre_validator() + _post_parse_value() to _value_post_validator()

Browse source
This commit is contained in:
axolotle 2023-04-07 17:44:53 +02:00
parent 9c238f00c3
commit 5f4c83a4eb
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/utils/form.py
View file

@ -279,7 +279,7 @@ class BaseOption:
try: try:
# Normalize and validate # Normalize and validate
self.value = self.normalize(self.value, self) self.value = self.normalize(self.value, self)
self._prevalidate() self._value_pre_validator()
except YunohostValidationError as e: except YunohostValidationError as e:
# If in interactive cli, re-ask the current question # If in interactive cli, re-ask the current question
if i < 4 and Moulinette.interface.type == "cli" and os.isatty(1): if i < 4 and Moulinette.interface.type == "cli" and os.isatty(1):
@ -292,7 +292,7 @@ class BaseOption:
break break
self.value = self.values[self.name] = self._post_parse_value() self.value = self.values[self.name] = self._value_post_validator()
# Search for post actions in hooks # Search for post actions in hooks
post_hook = f"post_ask__{self.name}" post_hook = f"post_ask__{self.name}"
@ -301,7 +301,7 @@ class BaseOption:
return self.values return self.values
def _prevalidate(self): def _value_pre_validator(self):
if self.value in [None, ""] and not self.optional: if self.value in [None, ""] and not self.optional:
raise YunohostValidationError("app_argument_required", name=self.name) raise YunohostValidationError("app_argument_required", name=self.name)
@ -353,7 +353,7 @@ class BaseOption:
return text_for_user_input_in_cli return text_for_user_input_in_cli
def _post_parse_value(self): def _value_post_validator(self):
if not self.redact: if not self.redact:
return self.value return self.value
@ -439,8 +439,8 @@ class PasswordOption(BaseOption):
"app_argument_password_no_default", name=self.name "app_argument_password_no_default", name=self.name
) )
def _prevalidate(self): def _value_pre_validator(self):
super()._prevalidate() super()._value_pre_validator()
if self.value not in [None, ""]: if self.value not in [None, ""]:
if any(char in self.value for char in self.forbidden_chars): if any(char in self.value for char in self.forbidden_chars):
@ -494,8 +494,8 @@ class NumberOption(BaseOption):
error=m18n.n("invalid_number"), error=m18n.n("invalid_number"),
) )
def _prevalidate(self): def _value_pre_validator(self):
super()._prevalidate() super()._value_pre_validator()
if self.value in [None, ""]: if self.value in [None, ""]:
return return
@ -610,10 +610,10 @@ class DateOption(StringOption):
"error": "config_validate_date", # i18n: config_validate_date "error": "config_validate_date", # i18n: config_validate_date
} }
def _prevalidate(self): def _value_pre_validator(self):
from datetime import datetime from datetime import datetime
super()._prevalidate() super()._value_pre_validator()
if self.value not in [None, ""]: if self.value not in [None, ""]:
try: try:
@ -691,11 +691,11 @@ class FileOption(BaseOption):
super().__init__(question, context, hooks) super().__init__(question, context, hooks)
self.accept = question.get("accept", "") self.accept = question.get("accept", "")
def _prevalidate(self): def _value_pre_validator(self):
if self.value is None: if self.value is None:
self.value = self.current_value self.value = self.current_value
super()._prevalidate() super()._value_pre_validator()
# Validation should have already failed if required # Validation should have already failed if required
if self.value in [None, ""]: if self.value in [None, ""]:
@ -711,7 +711,7 @@ class FileOption(BaseOption):
error=m18n.n("file_does_not_exist", path=str(self.value)), error=m18n.n("file_does_not_exist", path=str(self.value)),
) )
def _post_parse_value(self): def _value_post_validator(self):
from base64 import b64decode from base64 import b64decode
if not self.value: if not self.value:
@ -757,7 +757,7 @@ class TagsOption(BaseOption):
value = value.strip() value = value.strip()
return value return value
def _prevalidate(self): def _value_pre_validator(self):
values = self.value values = self.value
if isinstance(values, str): if isinstance(values, str):
values = values.split(",") values = values.split(",")
@ -780,13 +780,13 @@ class TagsOption(BaseOption):
for value in values: for value in values:
self.value = value self.value = value
super()._prevalidate() super()._value_pre_validator()
self.value = values self.value = values
def _post_parse_value(self): def _value_post_validator(self):
if isinstance(self.value, list): if isinstance(self.value, list):
self.value = ",".join(self.value) self.value = ",".join(self.value)
return super()._post_parse_value() return super()._value_post_validator()
class DomainOption(BaseOption): class DomainOption(BaseOption):