did some refactoring and renaming

This commit is contained in:
2026-01-04 20:35:13 -05:00
parent 0230cb4074
commit 078cdd4ab3
3 changed files with 70 additions and 104 deletions

View File

@@ -24,35 +24,19 @@ class SoftPathGroup(Enum):
MEM = 2
EXE = 3
_AppParams = Dict("_AppParams", {
SoftPathGroup.CONFIG.name: {
SoftScope.PERSONAL.name: IdlePath | list[IdlePath],
SoftScope.LOCAL.name: IdlePath | list[IdlePath],
SoftScope.GLOBAL.name: IdlePath | list[IdlePath]
},
SoftPathGroup.DATA.name: {
SoftScope.PERSONAL.name: IdlePath | list[IdlePath],
SoftScope.LOCAL.name: IdlePath | list[IdlePath],
SoftScope.GLOBAL.name: IdlePath | list[IdlePath]
},
SoftPathGroup.MEM.name: {
SoftScope.PERSONAL.name: IdlePath | list[IdlePath],
SoftScope.LOCAL.name: IdlePath | list[IdlePath],
SoftScope.GLOBAL.name: IdlePath | list[IdlePath]
},
SoftPathGroup.EXE.name: {
SoftScope.PERSONAL.name: IdlePath | list[IdlePath],
SoftScope.LOCAL.name: IdlePath | list[IdlePath],
SoftScope.GLOBAL.name: IdlePath | list[IdlePath]
}
}, total=False)
_SubAppParams = Dict("_SubAppParams", {
SoftScope.PERSONAL.name: IdlePath | list[IdlePath],
SoftScope.LOCAL.name: IdlePath | list[IdlePath],
SoftScope.GLOBAL.name: IdlePath | list[IdlePath]
}, total=False)
AppParams = Dict("AppParams", {
SoftPathGroup.CONFIG.name: _SubAppParams,
SoftPathGroup.DATA.name: _SubAppParams,
SoftPathGroup.MEM.name: _SubAppParams,
SoftPathGroup.EXE.name: _SubAppParams
}, total=False)
def _AppsInit(self, CONFIG = None, DATA = None, MEM = None, EXE = None):
def __AppsInit(self, CONFIG = None, DATA = None, MEM = None, EXE = None):
self.CONFIG = CONFIG
self.DATA = DATA
self.MEM = MEM
@@ -78,9 +62,9 @@ __app_input = {
SoftScope.LOCAL.name: [],
SoftScope.GLOBAL.name: []
},
"__init__": _AppsInit
"__init__": __AppsInit
}
_Apps = type("_Apps", (), __app_input)
Apps = type("Apps", (), __app_input)
# @TODO continue adding magic methods to below class
# @NOTE https://rszalski.github.io/magicmethods/#sequence
@@ -91,16 +75,16 @@ class Software:
self._fqdn: str | None = None
# @TODO fix NameError for 'Software' in parameter type check
def declare(self, name: str, **kwpaths: _SubAppParams) -> _AppParams:
keyword_args: _AppParams = kwpaths
def declare(self, name: str, **kwpaths: _SubAppParams) -> AppParams:
keyword_args: AppParams = kwpaths
app = _Apps(**keyword_args)
app = Apps(**keyword_args)
setattr(self, name, app)
return app
def __getitem__(self, key: str) -> _AppParams | Never:
def __getitem__(self, key: str) -> AppParams | Never:
if hasattr(self, key):
app: _Apps = getattr(self, key)
app: Apps = getattr(self, key)
else:
raise KeyError
return app
@@ -112,7 +96,7 @@ class Software:
app_params: _SubAppParams = value
if hasattr(self, key[0]):
app: _Apps = getattr(self, key[0])
app: Apps = getattr(self, key[0])
if hasattr(app, key[1]):
app_child: _SubAppParams = getattr(app, key[1])
@@ -138,14 +122,14 @@ class Software:
if len(key) == 1:
delattr(self, key[0])
elif len(key) > 1:
app: _Apps = getattr(self, key[0])
app: Apps = getattr(self, key[0])
delattr(app, key[1])
setattr(self, key[0], app)
def list(self, contents: bool = False) -> tuple[str]:
apps: tuple[str] | tuple[_Apps] = tuple(
apps: tuple[str] | tuple[Apps] = tuple(
filter(
lambda a: isinstance(getattr(self, a), _Apps),
lambda a: isinstance(getattr(self, a), Apps),
dir(self)
)
)
@@ -163,7 +147,7 @@ class Software:
def __len__(self) -> int:
apps: tuple[str] = tuple(
filter(
lambda a: isinstance(getattr(self, a), _Apps),
lambda a: isinstance(getattr(self, a), Apps),
dir(self)
)
)