Bugfixes
This commit is contained in:
@@ -5,6 +5,7 @@ from cpl.configuration.configuration_model_abc import ConfigurationModelABC
|
||||
from cpl.console.console import Console
|
||||
from cpl.console.foreground_color_enum import ForegroundColorEnum
|
||||
from cpl_cli.configuration.build_settings_name_enum import BuildSettingsNameEnum
|
||||
from cpl_cli.configuration.project_type_enum import ProjectTypeEnum
|
||||
|
||||
|
||||
class BuildSettings(ConfigurationModelABC):
|
||||
@@ -12,6 +13,7 @@ class BuildSettings(ConfigurationModelABC):
|
||||
def __init__(self):
|
||||
ConfigurationModelABC.__init__(self)
|
||||
|
||||
self._project_type: Optional[ProjectTypeEnum] = None
|
||||
self._source_path: Optional[str] = None
|
||||
self._output_path: Optional[str] = None
|
||||
self._main: Optional[str] = None
|
||||
@@ -21,6 +23,10 @@ class BuildSettings(ConfigurationModelABC):
|
||||
self._excluded: Optional[list[str]] = None
|
||||
self._package_data: Optional[dict[str, list[str]]] = None
|
||||
|
||||
@property
|
||||
def project_type(self):
|
||||
return self._project_type
|
||||
|
||||
@property
|
||||
def source_path(self) -> str:
|
||||
return self._source_path
|
||||
@@ -55,6 +61,7 @@ class BuildSettings(ConfigurationModelABC):
|
||||
|
||||
def from_dict(self, settings: dict):
|
||||
try:
|
||||
self._project_type = settings[BuildSettingsNameEnum.project_type.value]
|
||||
self._source_path = settings[BuildSettingsNameEnum.source_path.value]
|
||||
self._output_path = settings[BuildSettingsNameEnum.output_path.value]
|
||||
self._include_package_data = bool(settings[BuildSettingsNameEnum.include_package_data.value])
|
||||
|
@@ -3,6 +3,7 @@ from enum import Enum
|
||||
|
||||
class BuildSettingsNameEnum(Enum):
|
||||
|
||||
project_type = 'ProjectType'
|
||||
source_path = 'SourcePath'
|
||||
output_path = 'OutputPath'
|
||||
main = 'Main'
|
||||
|
7
src/cpl_cli/configuration/project_type_enum.py
Normal file
7
src/cpl_cli/configuration/project_type_enum.py
Normal file
@@ -0,0 +1,7 @@
|
||||
from enum import Enum
|
||||
|
||||
|
||||
class ProjectTypeEnum(Enum):
|
||||
|
||||
console = 'console'
|
||||
library = 'library'
|
@@ -34,6 +34,7 @@ class SettingsHelper:
|
||||
@staticmethod
|
||||
def get_build_settings_dict(build: BuildSettings) -> dict:
|
||||
return {
|
||||
BuildSettingsNameEnum.project_type.value: build.project_type,
|
||||
BuildSettingsNameEnum.source_path.value: build.source_path,
|
||||
BuildSettingsNameEnum.output_path.value: build.output_path,
|
||||
BuildSettingsNameEnum.main.value: build.main,
|
||||
|
Reference in New Issue
Block a user