Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

it is possible to pass site_name to get_anatomy_settings

Browse source
This commit is contained in:
iLLiCiTiT 2021-03-11 11:51:52 +01:00
parent a469f2d01a
commit c370d5f340
1 changed files with 26 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

50
pype/settings/lib.py
View file

@ -373,7 +373,7 @@ def apply_local_settings_on_system_settings(system_settings, local_settings):
def apply_local_settings_on_anatomy_settings( def apply_local_settings_on_anatomy_settings(
anatomy_settings, local_settings, project_name anatomy_settings, local_settings, project_name, site_name=None
): ):
"""Apply local settings on anatomy settings. """Apply local settings on anatomy settings.
@ -400,31 +400,36 @@ def apply_local_settings_on_anatomy_settings(
local_project_settings = local_settings.get("projects") or {} local_project_settings = local_settings.get("projects") or {}
# Get local settings fro default project and project specified in argument
project_locals = local_project_settings.get(project_name) or {}
default_locals = local_project_settings.get(DEFAULT_PROJECT_KEY) or {}
# Check for roots existence in local settings first # Check for roots existence in local settings first
roots_project_locals = project_locals.get("roots") or {} roots_project_locals = (
roots_default_locals = default_locals.get("roots") or {} local_project_settings
.get(project_name, {})
.get("roots", {})
)
roots_default_locals = (
local_project_settings
.get(DEFAULT_PROJECT_KEY, {})
.get("roots", {})
)
# Skip rest of processing if roots are not set # Skip rest of processing if roots are not set
if not roots_project_locals and not roots_default_locals: if not roots_project_locals and not roots_default_locals:
return return
# Get active site from settings # Get active site from settings
project_settings = get_project_settings(project_name) if site_name is None:
active_site = ( project_settings = get_project_settings(project_name)
project_settings["global"]["sync_server"]["config"]["active_site"] site_name = (
) project_settings["global"]["sync_server"]["config"]["active_site"]
)
# QUESTION should raise an exception? # QUESTION should raise an exception?
if not active_site: if not site_name:
return return
# Combine roots from local settings # Combine roots from local settings
roots_locals = roots_default_locals.get(active_site) or {} roots_locals = roots_default_locals.get(site_name) or {}
roots_locals.update(roots_project_locals.get(active_site) or {}) roots_locals.update(roots_project_locals.get(site_name) or {})
# Skip processing if roots for current active site are not available in # Skip processing if roots for current active site are not available in
# local settings # local settings
if not roots_locals: if not roots_locals:
@ -471,15 +476,12 @@ def apply_local_settings_on_project_settings(
or default_locals.get("remote_site") or default_locals.get("remote_site")
) )
if active_site or remote_site: sync_server_config = project_settings["global"]["sync_server"]["config"]
sync_server_config = ( if active_site:
project_settings["global"]["sync_server"]["config"] sync_server_config["active_site"] = active_site
)
if active_site:
sync_server_config["active_site"] = active_site
if remote_site: if remote_site:
sync_server_config["remote_site"] = active_site sync_server_config["remote_site"] = remote_site
def get_system_settings(clear_metadata=True): def get_system_settings(clear_metadata=True):
@ -547,12 +549,12 @@ def get_applied_anatomy_settings(project_name):
return result return result
def get_anatomy_settings(project_name): def get_anatomy_settings(project_name, site_name=None):
result = get_applied_anatomy_settings(project_name) result = get_applied_anatomy_settings(project_name)
local_settings = get_local_settings() local_settings = get_local_settings()
apply_local_settings_on_anatomy_settings( apply_local_settings_on_anatomy_settings(
result, local_settings, project_name result, local_settings, project_name, site_name
) )
return result return result