sh-edraft.de/sh_cpl
1
1
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Sven Heidemann 2021-03-14 11:15:43 +01:00
parent da582a8d88
commit d0af34ea25
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/cpl/configuration/configuration.py
View File

@ -105,6 +105,14 @@ class Configuration(ConfigurationABC):
if argument_type.value_token != '' and argument_type.value_token in argument: if argument_type.value_token != '' and argument_type.value_token in argument:
# ?new=value # ?new=value
found = False
for alias in argument_type.aliases:
if alias in argument:
found = True
if argument_type.name not in argument_name and not found:
return False
if argument_type.is_value_token_optional is not None and argument_type.is_value_token_optional: if argument_type.is_value_token_optional is not None and argument_type.is_value_token_optional:
if argument_type.name not in self._additional_arguments: if argument_type.name not in self._additional_arguments:
self._additional_arguments.append(argument_type.name) self._additional_arguments.append(argument_type.name)
@ -117,6 +125,8 @@ class Configuration(ConfigurationABC):
# new=value # new=value
argument_name = argument.split(argument_type.token)[1] argument_name = argument.split(argument_type.token)[1]
result = True
if argument_type.is_value_token_optional is True: if argument_type.is_value_token_optional is True:
is_valid = False is_valid = False
@ -134,15 +144,22 @@ class Configuration(ConfigurationABC):
else: else:
value = argument.split(argument_type.token)[1].split(argument_type.value_token)[1] value = argument.split(argument_type.token)[1].split(argument_type.value_token)[1]
if not result: if argument_name != argument_type.name and argument_name not in argument_type.aliases:
if argument_name != argument_type.name and argument_name not in argument_type.aliases: return False
return False
self._set_variable(argument_type.name, value) self._set_variable(argument_type.name, value)
result = True result = True
elif argument_type.value_token == ' ': elif argument_type.value_token == ' ':
# ?new value # ?new value
found = False
for alias in argument_type.aliases:
if alias in argument:
found = True
if argument_type.name not in argument_name and not found:
return False
if (next_arguments is None or len(next_arguments) == 0) and \ if (next_arguments is None or len(next_arguments) == 0) and \
argument_type.is_value_token_optional is not True: argument_type.is_value_token_optional is not True:
raise Exception(f'Invalid argument: {argument}') raise Exception(f'Invalid argument: {argument}')