Added new file structure
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
import os
|
||||
import sys
|
||||
from abc import ABC
|
||||
|
||||
from cpl.configuration.configuration_abc import ConfigurationABC
|
||||
from cpl.console.console import Console
|
||||
from cpl.dependency_injection.service_provider_abc import ServiceProviderABC
|
||||
from cpl_cli.configuration.workspace_settings import WorkspaceSettings
|
||||
from cpl_cli.error import Error
|
||||
from cpl_cli.command_model import CommandModel
|
||||
|
||||
@@ -28,6 +30,9 @@ class CommandHandler(ABC):
|
||||
def commands(self) -> list[CommandModel]:
|
||||
return self._commands
|
||||
|
||||
def _load_json(self):
|
||||
pass
|
||||
|
||||
def add_command(self, cmd: CommandModel):
|
||||
self._commands.append(cmd)
|
||||
|
||||
@@ -43,12 +48,48 @@ class CommandHandler(ABC):
|
||||
"""
|
||||
for command in self._commands:
|
||||
if cmd == command.name or cmd in command.aliases:
|
||||
if command.is_project_needed and not os.path.isfile(os.path.join(self._env.working_directory, 'cpl.json')):
|
||||
Error.error('The command requires to be run in an CPL project, but a project could not be found.')
|
||||
if command.is_project_needed and \
|
||||
not os.path.isfile(os.path.join(self._env.working_directory, 'cpl-workspace.json')):
|
||||
Error.error(
|
||||
'The command requires to be run in an CPL workspace, but a workspace could not be found.'
|
||||
)
|
||||
return
|
||||
|
||||
if command.is_project_needed:
|
||||
self._config.add_json_file('cpl.json', optional=True, output=False)
|
||||
self._config.add_json_file('cpl-workspace.json', optional=True, output=False)
|
||||
workspace: WorkspaceSettings = self._config.get_configuration(WorkspaceSettings)
|
||||
|
||||
if workspace is None:
|
||||
Error.error(
|
||||
'The command requires to be run in an CPL workspace, but a workspace could not be found.'
|
||||
)
|
||||
return
|
||||
|
||||
project_name = workspace.default_project
|
||||
if len(args) > 0:
|
||||
project_name = args[0]
|
||||
index = sys.argv.index(args[0]) + 1
|
||||
if index < len(sys.argv):
|
||||
args = sys.argv[index:]
|
||||
|
||||
if project_name not in workspace.projects:
|
||||
Error.error(
|
||||
f'Project {project_name} not found.'
|
||||
)
|
||||
return
|
||||
|
||||
project_json = workspace.projects[project_name]
|
||||
if not os.path.isfile(os.path.join(self._env.working_directory, project_json)):
|
||||
Error.error(
|
||||
'The command requires to be run in an CPL project, but a project could not be found.'
|
||||
)
|
||||
return
|
||||
|
||||
self._config.add_json_file(project_json, optional=True, output=False)
|
||||
|
||||
self._config.environment.set_working_directory(
|
||||
os.path.join(self._env.working_directory, os.path.dirname(project_json))
|
||||
)
|
||||
|
||||
self._services.get_service(command.command).run(args)
|
||||
Console.write('\n')
|
||||
|
Reference in New Issue
Block a user