settings function names are with verbs now

This commit is contained in:
iLLiCiTiT 2020-12-03 10:41:05 +01:00
parent 80a614261f
commit a97cc086ed
6 changed files with 49 additions and 49 deletions

View file

@ -69,7 +69,7 @@ def reset_default_settings():
_DEFAULT_SETTINGS = None
def default_settings():
def get_default_settings():
global _DEFAULT_SETTINGS
if _DEFAULT_SETTINGS is None:
_DEFAULT_SETTINGS = load_jsons_from_dir(DEFAULTS_DIR)
@ -236,21 +236,21 @@ def subkey_merge(_dict, value, keys):
return _dict
def studio_system_settings():
def get_studio_system_settings():
"""Studio overrides of system settings."""
if os.path.exists(SYSTEM_SETTINGS_PATH):
return load_json_file(SYSTEM_SETTINGS_PATH)
return {}
def studio_project_settings():
def get_studio_project_settings():
"""Studio overrides of default project settings."""
if os.path.exists(PROJECT_SETTINGS_PATH):
return load_json_file(PROJECT_SETTINGS_PATH)
return {}
def studio_project_anatomy():
def get_studio_project_anatomy():
"""Studio overrides of default project anatomy data."""
if os.path.exists(PROJECT_ANATOMY_PATH):
return load_json_file(PROJECT_ANATOMY_PATH)
@ -305,8 +305,8 @@ def save_project_settings(project_name, overrides):
Do not use to store whole project settings data with defaults but only it's
overrides with metadata defining how overrides should be applied in load
function. For loading should be used functions `studio_project_settings`
for global project settings and `project_settings_overrides` for
function. For loading should be used function `get_studio_project_settings`
for global project settings and `get_project_settings_overrides` for
project specific settings.
Args:
@ -346,7 +346,7 @@ def save_project_anatomy(project_name, anatomy_data):
json.dump(anatomy_data, file_stream, indent=4)
def project_settings_overrides(project_name):
def get_project_settings_overrides(project_name):
"""Studio overrides of project settings for specific project.
Args:
@ -412,26 +412,26 @@ def apply_overrides(source_data, override_data):
return merge_overrides(_source_data, override_data)
def system_settings():
def get_system_settings():
"""System settings with applied studio overrides."""
default_values = default_settings()[SYSTEM_SETTINGS_KEY]
studio_values = studio_system_settings()
default_values = get_default_settings()[SYSTEM_SETTINGS_KEY]
studio_values = get_studio_system_settings()
return apply_overrides(default_values, studio_values)
def project_settings(project_name):
def get_project_settings(project_name):
"""Project settings with applied studio and project overrides."""
default_values = default_settings()[PROJECT_SETTINGS_KEY]
studio_values = studio_project_settings()
default_values = get_default_settings()[PROJECT_SETTINGS_KEY]
studio_values = get_studio_project_settings()
studio_overrides = apply_overrides(default_values, studio_values)
project_overrides = project_settings_overrides(project_name)
project_overrides = get_project_settings_overrides(project_name)
return apply_overrides(studio_overrides, project_overrides)
def environments():
def get_environments():
"""Calculated environment based on defaults and system settings.
Any default environment also found in the system settings will be fully