dschick/git_brcal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow special characters &,-,_ for ship name and callsign

Browse Source
This commit is contained in:
Daniel Schick 2025-07-25 13:05:47 +02:00
parent 7fea4d27b7
commit 62bd6304c4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/server/BreCal/validators/validation_base_utils.py
View File

@ -1,26 +1,25 @@
import typing import typing
from string import ascii_letters, digits import re
_VALID = re.compile(r'^[\w &-]+$') # \w == Unicode letters+digits+underscore
def check_if_string_has_special_characters(text:typing.Optional[str]): def check_if_string_has_special_characters(text:typing.Optional[str]):
""" """
check, whether there are any characters within the provided string, which are not found in the ascii letters or digits check, whether there are any characters within the provided string, which are not found in the ascii letters or digits
ascii_letters: abcd (...) and ABCD (...)
digits: 0123 (...)
Formerly, this solution was used but was found to be too restrictive:
Source: https://stackoverflow.com/questions/57062794/is-there-a-way-to-check-if-a-string-contains-special-characters Source: https://stackoverflow.com/questions/57062794/is-there-a-way-to-check-if-a-string-contains-special-characters
User: https://stackoverflow.com/users/10035985/andrej-kesely User: https://stackoverflow.com/users/10035985/andrej-kesely
returns bool returns bool
""" """
if text is None: return not _VALID.fullmatch(text) if text else False
return False
return bool(set(text).difference(ascii_letters + digits + ' '))
def check_if_int_is_valid_flag(value, enum_object): def check_if_int_is_valid_flag(value, enum_object):
if value is None: # when no value is provided, the value is considered valid. if value is None: # when no value is provided, the value is considered valid.
return False return False
# e.g., when an IntFlag has the values 1,2,4; the maximum valid value is 7 # e.g., when an IntFlag has the values 1,2,4; the maximum valid value is 7
max_int = sum([int(val) for val in list(enum_object._value2member_map_.values())]) max_int = sum([int(val) for val in list(enum_object._value2member_map_.values())])
return 0 < value <= max_int return 0 < value <= max_int