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

fix logo handling

Browse source
This commit is contained in:
checktheroads 2020-03-29 20:03:36 -07:00
parent 7d359c084b
commit 3488f86e39
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
hyperglass/configuration/models/_utils.py
View file

@ -9,7 +9,7 @@ from pathlib import Path
from pydantic import HttpUrl, BaseModel
# Project
from hyperglass.util import clean_name
from hyperglass.util import clean_name, log
class HyperglassModel(BaseModel):
@ -144,10 +144,8 @@ def validate_image(value):
Returns:
{str} -- Formatted logo path
"""
base_path = value.split("/")
if base_path[0] == "/":
value = "/".join(base_path[1:])
config_path = Path(os.environ["hyperglass_directory"])
base_path = [v for v in value.split("/") if v != ""]
if base_path[0] not in ("images", "custom"):
raise ValueError(
@ -155,10 +153,15 @@ def validate_image(value):
)
if base_path[0] == "custom":
config_path = Path(os.environ["hyperglass_directory"])
custom_file = config_path / "static" / value
file = config_path / "static" / "custom" / "/".join(base_path[1:])
if not custom_file.exists():
raise ValueError(f"'{str(custom_file)}' does not exist")
else:
file = config_path / "static" / "images" / "/".join(base_path[1:])
return value
log.error(file)
if not file.exists():
raise ValueError(f"'{str(file)}' does not exist")
base_index = file.parts.index(base_path[0])
return "/".join(file.parts[base_index:])