mirror/checktheroads-hyperglass
1
0
Fork 0
mirror of https://github.com/checktheroads/hyperglass synced 2024-05-11 05:55:08 +00:00
Code 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
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 from pydantic import HttpUrl, BaseModel
# Project # Project
from hyperglass.util import clean_name from hyperglass.util import clean_name, log
class HyperglassModel(BaseModel): class HyperglassModel(BaseModel):
@@ -144,10 +144,8 @@ def validate_image(value):
Returns: Returns:
{str} -- Formatted logo path {str} -- Formatted logo path
""" """
base_path = value.split("/") config_path = Path(os.environ["hyperglass_directory"])
base_path = [v for v in value.split("/") if v != ""]
if base_path[0] == "/":
value = "/".join(base_path[1:])
if base_path[0] not in ("images", "custom"): if base_path[0] not in ("images", "custom"):
raise ValueError( raise ValueError(
@@ -155,10 +153,15 @@ def validate_image(value):
) )
if base_path[0] == "custom": if base_path[0] == "custom":
config_path = Path(os.environ["hyperglass_directory"]) file = config_path / "static" / "custom" / "/".join(base_path[1:])
custom_file = config_path / "static" / value
if not custom_file.exists(): else:
raise ValueError(f"'{str(custom_file)}' does not exist") 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:])