From bf313d4d08d519cfd4f332c2cc7ca33ef47a035e Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 16 Mar 2021 15:32:52 +0100 Subject: [PATCH] system and project schemas have their methods for getting schema data --- pype/settings/entities/lib.py | 10 +++++++++- pype/settings/entities/root_entities.py | 7 ++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pype/settings/entities/lib.py b/pype/settings/entities/lib.py index 42164fbce9..7eec3225a1 100644 --- a/pype/settings/entities/lib.py +++ b/pype/settings/entities/lib.py @@ -237,7 +237,7 @@ def validate_schema(schema_data): validate_environment_groups_uniquenes(schema_data) -def gui_schema(subfolder, main_schema_name): +def get_gui_schema(subfolder, main_schema_name): dirpath = os.path.join( os.path.dirname(__file__), "schemas", @@ -273,6 +273,14 @@ def gui_schema(subfolder, main_schema_name): return main_schema +def get_studio_settings_schema(): + return get_gui_schema("projects_schema", "schema_main") + + +def get_project_settings_schema(): + return get_gui_schema("projects_schema", "schema_main") + + class OverrideStateItem: """Object used as item for `OverrideState` enum. diff --git a/pype/settings/entities/root_entities.py b/pype/settings/entities/root_entities.py index 88b9da2428..6e804cb286 100644 --- a/pype/settings/entities/root_entities.py +++ b/pype/settings/entities/root_entities.py @@ -10,7 +10,8 @@ from .lib import ( NOT_SET, WRAPPER_TYPES, OverrideState, - gui_schema + get_studio_settings_schema, + get_project_settings_schema ) from pype.settings.constants import ( SYSTEM_SETTINGS_KEY, @@ -450,7 +451,7 @@ class SystemSettings(RootEntity): ): if schema_data is None: # Load system schemas - schema_data = gui_schema("system_schema", "schema_main") + schema_data = get_studio_settings_schema() super(SystemSettings, self).__init__(schema_data, reset) @@ -565,7 +566,7 @@ class ProjectSettings(RootEntity): if schema_data is None: # Load system schemas - schema_data = gui_schema("projects_schema", "schema_main") + schema_data = get_project_settings_schema() super(ProjectSettings, self).__init__(schema_data, reset)