Smaller bugfixes

This commit is contained in:
2021-03-04 06:42:40 +01:00
parent 8872d1bfe7
commit 2c2c1ede21
6 changed files with 33 additions and 21 deletions

View File

@@ -1,3 +1,4 @@
import atexit
from abc import ABC, abstractmethod
from typing import Type, Optional
@@ -20,6 +21,10 @@ class ApplicationABC(ABC):
def use_startup(self, startup: Type[StartupABC]):
self._startup = startup()
@staticmethod
def output_at_exit():
atexit.register(Console.close)
def build(self):
if self._startup is not None:
self._app_host = self._startup.create_application_host()

View File

@@ -1,4 +1,3 @@
import atexit
from datetime import datetime
from cpl.application.application_host_abc import ApplicationHostABC
@@ -6,7 +5,6 @@ from cpl.application.application_runtime import ApplicationRuntime
from cpl.application.application_runtime_abc import ApplicationRuntimeABC
from cpl.configuration.configuration import Configuration
from cpl.configuration.configuration_abc import ConfigurationABC
from cpl.console.console import Console
from cpl.dependency_injection.service_provider import ServiceProvider
from cpl.dependency_injection.service_provider_base import ServiceProviderABC
@@ -25,8 +23,6 @@ class ApplicationHost(ApplicationHostABC):
self._start_time: datetime = datetime.now()
self._end_time: datetime = datetime.now()
atexit.register(Console.close)
@property
def configuration(self) -> ConfigurationABC:
return self._config

View File

@@ -1,9 +1,9 @@
from typing import Optional
from cpl.application.application_abc import ApplicationABC
from cpl.console.console import Console
from cpl_cli.command import Command
from cpl_cli.command_handler import CommandHandler
from cpl_cli.error import Error
from cpl_cli.commands.help import Help
from cpl_cli.commands.version import Version
@@ -23,8 +23,7 @@ class CLI(ApplicationABC):
def main(self):
if len(self._configuration.additional_arguments) < 1:
Console.error(f'Expected command')
Console.error('Run \'cpl help\'')
Error.error(f'Expected command')
return
self._command_handler.handle(self._configuration.additional_arguments[0], self._configuration.additional_arguments[1:])

View File

@@ -18,5 +18,4 @@ class CommandHandler(ServiceABC):
def handle(self, cmd: str, args: list[str]):
for command in self._commands:
if cmd == command.name or cmd in command.aliases:
print(command.command)
command.command.run(args)

9
src/cpl_cli/error.py Normal file
View File

@@ -0,0 +1,9 @@
from cpl.console.console import Console
class Error:
@staticmethod
def error(message: str):
Console.error(message)
Console.error('Run \'cpl help\'')