diff --git a/argenta/app/entity.py b/argenta/app/entity.py index 37a0dda..b762caf 100644 --- a/argenta/app/entity.py +++ b/argenta/app/entity.py @@ -164,11 +164,11 @@ class App: router.set_router_as_main() self._app_main_router = router - if not self._app_main_router.unknown_command_func: + if not self._app_main_router.get_unknown_command_func(): raise MissingHandlerForUnknownCommandsException() for router in self._routers: - if router.unknown_command_func and self._app_main_router is not router: + if router.get_unknown_command_func() and self._app_main_router is not router: raise HandlerForUnknownCommandsOnNonMainRouterException() diff --git a/argenta/command/input_comand/__pycache__/__init__.cpython-313.pyc b/argenta/command/input_comand/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 427b945..0000000 Binary files a/argenta/command/input_comand/__pycache__/__init__.cpython-313.pyc and /dev/null differ diff --git a/argenta/command/input_comand/__pycache__/entity.cpython-313.pyc b/argenta/command/input_comand/__pycache__/entity.cpython-313.pyc deleted file mode 100644 index 19fdb28..0000000 Binary files a/argenta/command/input_comand/__pycache__/entity.cpython-313.pyc and /dev/null differ diff --git a/argenta/command/input_comand/__pycache__/exceptions.cpython-313.pyc b/argenta/command/input_comand/__pycache__/exceptions.cpython-313.pyc deleted file mode 100644 index 67bb8db..0000000 Binary files a/argenta/command/input_comand/__pycache__/exceptions.cpython-313.pyc and /dev/null differ diff --git a/argenta/router/entity.py b/argenta/router/entity.py index 514bdfe..86a7891 100644 --- a/argenta/router/entity.py +++ b/argenta/router/entity.py @@ -16,7 +16,7 @@ class Router: self.name = name self._command_entities: list[dict[str, Callable[[], None] | Command]] = [] - self.unknown_command_func: Callable[[str], None] | None = None + self._unknown_command_func: Callable[[str], None] | None = None self._is_main_router: bool = False self._ignore_command_register: bool = False @@ -36,10 +36,10 @@ class Router: def unknown_command(self, func): - if self.unknown_command_func is not None: + if self._unknown_command_func is not None: raise UnknownCommandHandlerHasAlreadyBeenCreatedException() - self.unknown_command_func: Callable = func + self._unknown_command_func: Callable = func def wrapper(*args, **kwargs): return func(*args, **kwargs) @@ -71,8 +71,12 @@ class Router: return command_entity['handler_func']() + def get_unknown_command_func(self): + return self._unknown_command_func + + def unknown_command_handler(self, unknown_command): - self.unknown_command_func(unknown_command) + self._unknown_command_func(unknown_command) def _validate_command(self, command: Command): @@ -119,7 +123,7 @@ class Router: 'ignore_command_register': self._ignore_command_register, 'attributes': { 'command_entities': self._command_entities, - 'unknown_command_func': self.unknown_command_func, + 'unknown_command_func': self._unknown_command_func, 'is_main_router': self._is_main_router } diff --git a/tests/mock_app/handlers/routers.py b/tests/mock_app/handlers/routers.py index 3c417b4..e1bf9aa 100644 --- a/tests/mock_app/handlers/routers.py +++ b/tests/mock_app/handlers/routers.py @@ -12,11 +12,11 @@ settings_router: Router = Router(title='Settings points:') console = Console() -flagi =FlagsGroup(flags=[ +flagi = FlagsGroup(flags=[ Flag(flag_name='host', - flag_prefix='--',), + flag_prefix='--', ), Flag(flag_name='port', - flag_prefix='--',) + flag_prefix='--', ) ]) @@ -29,7 +29,7 @@ def command_help(args: FlagsGroup): #help_command() -@work_router.command(Command(command='I', description='Start Solving', flags=flagi)) +@work_router.command(Command(command='P', description='Start Solving', flags=flagi)) def command_start_solving(args: FlagsGroup): print('Solving...') flags = args.get_flags() @@ -38,7 +38,7 @@ def command_start_solving(args: FlagsGroup): #start_solving_command() -@settings_router.command(Command(command='i', description='Update WordMath')) +@settings_router.command(Command(command='G', description='Update WordMath')) def command_update(): print('uefi') # upgrade_command()