Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed overrides getter function

Browse source
This commit is contained in:
iLLiCiTiT 2020-12-03 15:53:04 +01:00
parent 025cf4e8cc
commit ca7663bbc9
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pype/settings/lib.py
View file

@ -288,7 +288,7 @@ 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 function
`get_studio_overrides_default_project_settings` for global project settings
`get_studio_project_settings_overrides` for global project settings
and `get_project_settings_overrides` for project specific settings.
Args:
@ -328,21 +328,21 @@ def save_project_anatomy(project_name, anatomy_data):
json.dump(anatomy_data, file_stream, indent=4)
def get_studio_overrides_system_settings():
def get_studio_system_settings_overrides():
"""Studio overrides of system settings."""
if os.path.exists(SYSTEM_SETTINGS_PATH):
return load_json_file(SYSTEM_SETTINGS_PATH)
return {}
def get_studio_overrides_default_project_settings():
def get_studio_project_settings_overrides():
"""Studio overrides of default project settings."""
if os.path.exists(PROJECT_SETTINGS_PATH):
return load_json_file(PROJECT_SETTINGS_PATH)
return {}
def get_studio_overrides_default_project_anatomy():
def get_studio_project_anatomy_overrides():
"""Studio overrides of default project anatomy data."""
if os.path.exists(PROJECT_ANATOMY_PATH):
return load_json_file(PROJECT_ANATOMY_PATH)
@ -416,14 +416,14 @@ def apply_overrides(source_data, override_data):
def get_system_settings():
"""System settings with applied studio overrides."""
default_values = get_default_settings()[SYSTEM_SETTINGS_KEY]
studio_values = get_studio_overrides_system_settings()
studio_values = get_studio_system_settings_overrides()
return apply_overrides(default_values, studio_values)
def get_default_project_settings():
"""Project settings with applied studio's default project overrides."""
default_values = get_default_settings()[PROJECT_SETTINGS_KEY]
studio_values = get_studio_overrides_default_project_settings()
studio_values = get_studio_project_settings_overrides()
return apply_overrides(default_values, studio_values)

8
pype/tools/settings/settings/widgets/base.py
View file

@ -12,8 +12,8 @@ from pype.settings.lib import (
reset_default_settings,
get_default_settings,
get_studio_overrides_system_settings,
get_studio_overrides_default_project_settings,
get_studio_system_settings_overrides,
get_studio_project_settings_overrides,
get_studio_overrides_default_project_anatomy,
get_project_settings_overrides,
@ -384,7 +384,7 @@ class SystemWidget(SettingsCategoryWidget):
system_values = lib.NOT_SET
else:
system_values = lib.convert_overrides_to_gui_data(
{self.main_schema_key: get_studio_overrides_system_settings()}
{self.main_schema_key: get_studio_system_settings_overrides()}
)
for input_field in self.input_fields:
@ -610,7 +610,7 @@ class ProjectWidget(SettingsCategoryWidget):
studio_values = lib.convert_overrides_to_gui_data({
self.main_schema_key: {
PROJECT_SETTINGS_KEY: (
get_studio_overrides_default_project_settings()
get_studio_project_settings_overrides()
),
PROJECT_ANATOMY_KEY: (
get_studio_overrides_default_project_anatomy()