witine/lookingglass
1
0
Fork 0
forked from mirrors/thatmattlove-hyperglass
Code Issues Pull requests Releases Activity

fix prepending of HYPERGLASS_APP_PATH to values; closes #253

Browse source
This commit is contained in:
thatmattlove 2024-06-01 15:08:59 -04:00
parent 8a3d704eca
commit bfcae89bf0
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hyperglass/main.py
View file

@ -162,6 +162,9 @@ def run(workers: int = None):
log.bind( log.bind(
version=__version__, version=__version__,
listening=f"http://{Settings.bind()}", listening=f"http://{Settings.bind()}",
app_path=f"{Settings.app_path.absolute()!s}",
container=Settings.container,
original_app_path=f"{Settings.original_app_path.absolute()!s}",
workers=_workers, workers=_workers,
).info( ).info(
"Starting hyperglass", "Starting hyperglass",

14
hyperglass/models/main.py
View file

@ -59,15 +59,23 @@ class HyperglassModel(BaseModel):
if isinstance(value, Path): if isinstance(value, Path):
if Settings.container: if Settings.container:
return Settings.default_app_path.joinpath( return Settings.default_app_path.joinpath(
*(p for p in value.parts if p not in Settings.original_app_path.parts) *(
p
for p in value.parts
if p not in Settings.original_app_path.absolute().parts
)
) )
if isinstance(value, str) and str(Settings.original_app_path) in value: if isinstance(value, str) and str(Settings.original_app_path.absolute()) in value:
if Settings.container: if Settings.container:
path = Path(value) path = Path(value)
return str( return str(
Settings.default_app_path.joinpath( Settings.default_app_path.joinpath(
*(p for p in path.parts if p not in Settings.original_app_path.parts) *(
p
for p in path.parts
if p not in Settings.original_app_path.absolute().parts
)
) )
) )