1
0
Fork 0
mirror of https://github.com/yavook/kiwi-scp.git synced 2024-12-25 10:33:01 +00:00
This commit is contained in:
Jörn-Michael Miehe 2021-10-20 03:11:33 +02:00
parent b568e449f5
commit fdedf20ba3

View file

@ -62,6 +62,8 @@ class _Project(BaseModel):
@validator("override_storage", pre=True)
@classmethod
def unify_storage(cls, value):
"""parse different storage notations"""
if value is None or isinstance(value, dict):
return value
@ -300,18 +302,23 @@ class Config(BaseModel):
"""parse different storage notations"""
if value is None:
# empty storage
raise ValueError("No Storage Given")
elif isinstance(value, dict):
# native dict format
return value
elif isinstance(value, str):
# just the directory string
return {"directory": value}
elif isinstance(value, list) and len(value) == 1:
elif isinstance(value, list) and len(value) == 1 and isinstance(value[0], str):
# directory string as a single-item list
return {"directory": value[0]}
else:
# undefined format
raise ValueError("Invalid Storage Format")
@validator("network", pre=True)
@ -320,11 +327,14 @@ class Config(BaseModel):
"""parse different network notations"""
if value is None:
# empty network
raise ValueError("No Network Given")
elif isinstance(value, dict):
# native dict format
return value
else:
# undefined format
raise ValueError("Invalid Network Format")