rislaed/icmtoolchain
0
Fork 0
Code Issues Pull Requests Releases Activity

Moved project selection to abstraction, at least for now

Browse Source
This commit is contained in:
MaXFeeD
2025-05-10 17:00:08 +03:00
parent e5dfe104cd
commit d51cc104a2
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/icmtoolchain/make_config.py
+14 -14
View File
@@ -86,8 +86,20 @@ class MakeAssetData:
cleanup_remote: bool = True cleanup_remote: bool = True
class AbstractMakeConfig(FileConfig, metaclass=ABCMeta): class AbstractMakeConfig(FileConfig, metaclass=ABCMeta):
defaults: FileConfig
current_project: Final[str]
project_unique_name: Final[str]
def __init__(self, path: str, defaults: FileConfig) -> None: def __init__(self, path: str, defaults: FileConfig) -> None:
if not isfile(path):
abort(f"Not found {basename(path)!r}, are you sure that selected project exists?")
self.current_project = defaults.get_value("currentProject")
super().__init__(path, defaults, raise_non_existing=True) super().__init__(path, defaults, raise_non_existing=True)
from .output_directory import unique_folder_name
self.project_unique_name = unique_folder_name(self.directory)
def get_build_path(self, relative_path: str) -> str:
return self.defaults.get_relative_path(join("build", self.project_unique_name, relative_path))
@property @property
@abstractmethod @abstractmethod
@@ -180,22 +192,13 @@ class AbstractMakeConfig(FileConfig, metaclass=ABCMeta):
""" """
... ...
class MakeConfig(FileConfig): class MakeConfig(AbstractMakeConfig):
defaults: FileConfig
current_project: Final[str]
project_unique_name: Final[str]
def __init__(self, path: str, defaults: FileConfig) -> None: def __init__(self, path: str, defaults: FileConfig) -> None:
if not isfile(path): super().__init__(path, defaults)
abort(f"Not found {basename(path)!r}, are you sure that selected project exists?")
self.current_project = defaults.get_value("currentProject")
super().__init__(path, defaults=defaults)
if "make.json" == basename(path): if "make.json" == basename(path):
self.migrate_make_config(self) self.migrate_make_config(self)
if "toolchain.json" == basename(defaults.path): if "toolchain.json" == basename(defaults.path):
self.migrate_make_config(defaults) self.migrate_make_config(defaults)
from .output_directory import unique_folder_name
self.project_unique_name = unique_folder_name(self.directory)
def migrate_make_config(self, config: FileConfig, save_then: bool = True) -> bool: def migrate_make_config(self, config: FileConfig, save_then: bool = True) -> bool:
changes = False changes = False
@@ -224,6 +227,3 @@ class MakeConfig(FileConfig):
if save_then and changes: if save_then and changes:
config.save_as_file() config.save_as_file()
return changes return changes
def get_build_path(self, relative_path: str) -> str:
return self.defaults.get_relative_path(join("build", self.project_unique_name, relative_path))