This commit is contained in:
2025-02-23 13:25:51 +03:00
parent eac5358ead
commit ddf2a2fb10
6 changed files with 16 additions and 12 deletions
+2 -2
View File
@@ -164,11 +164,11 @@ class App:
router.set_router_as_main() router.set_router_as_main()
self._app_main_router = router 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() raise MissingHandlerForUnknownCommandsException()
for router in self._routers: 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() raise HandlerForUnknownCommandsOnNonMainRouterException()
+9 -5
View File
@@ -16,7 +16,7 @@ class Router:
self.name = name self.name = name
self._command_entities: list[dict[str, Callable[[], None] | Command]] = [] 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._is_main_router: bool = False
self._ignore_command_register: bool = False self._ignore_command_register: bool = False
@@ -36,10 +36,10 @@ class Router:
def unknown_command(self, func): def unknown_command(self, func):
if self.unknown_command_func is not None: if self._unknown_command_func is not None:
raise UnknownCommandHandlerHasAlreadyBeenCreatedException() raise UnknownCommandHandlerHasAlreadyBeenCreatedException()
self.unknown_command_func: Callable = func self._unknown_command_func: Callable = func
def wrapper(*args, **kwargs): def wrapper(*args, **kwargs):
return func(*args, **kwargs) return func(*args, **kwargs)
@@ -71,8 +71,12 @@ class Router:
return command_entity['handler_func']() return command_entity['handler_func']()
def get_unknown_command_func(self):
return self._unknown_command_func
def unknown_command_handler(self, unknown_command): 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): def _validate_command(self, command: Command):
@@ -119,7 +123,7 @@ class Router:
'ignore_command_register': self._ignore_command_register, 'ignore_command_register': self._ignore_command_register,
'attributes': { 'attributes': {
'command_entities': self._command_entities, '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 'is_main_router': self._is_main_router
} }
+5 -5
View File
@@ -12,11 +12,11 @@ settings_router: Router = Router(title='Settings points:')
console = Console() console = Console()
flagi =FlagsGroup(flags=[ flagi = FlagsGroup(flags=[
Flag(flag_name='host', Flag(flag_name='host',
flag_prefix='--',), flag_prefix='--', ),
Flag(flag_name='port', Flag(flag_name='port',
flag_prefix='--',) flag_prefix='--', )
]) ])
@@ -29,7 +29,7 @@ def command_help(args: FlagsGroup):
#help_command() #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): def command_start_solving(args: FlagsGroup):
print('Solving...') print('Solving...')
flags = args.get_flags() flags = args.get_flags()
@@ -38,7 +38,7 @@ def command_start_solving(args: FlagsGroup):
#start_solving_command() #start_solving_command()
@settings_router.command(Command(command='i', description='Update WordMath')) @settings_router.command(Command(command='G', description='Update WordMath'))
def command_update(): def command_update():
print('uefi') print('uefi')
# upgrade_command() # upgrade_command()