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

removed DEFAULT_PROJECT_KEY from constants as it is handler specific

Browse source
This commit is contained in:
iLLiCiTiT 2021-02-23 17:37:17 +01:00
parent 4d1b825328
commit f1190ce053
2 changed files with 25 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pype/settings/constants.py
View file

@ -17,8 +17,6 @@ PROJECT_SETTINGS_KEY = "project_settings"
PROJECT_ANATOMY_KEY = "project_anatomy"
LOCAL_SETTING_KEY = "local_settings"
# Key replacing `None` as key for local settings values
DEFAULT_PROJECT_KEY = "__default_project__"
__all__ = (
"M_OVERRIDEN_KEY",
@ -30,7 +28,5 @@ __all__ = (
"SYSTEM_SETTINGS_KEY",
"PROJECT_SETTINGS_KEY",
"PROJECT_ANATOMY_KEY",
"LOCAL_SETTING_KEY",
"DEFAULT_PROJECT_KEY"
"LOCAL_SETTING_KEY"
)

30
pype/settings/handlers.py
View file

@ -517,6 +517,7 @@ class MongoSettingsHandler(SettingsHandler):
class MongoLocalSettingshandler(LocalSettingsHandler):
"""Settings handler that use mongo for store and load local settings."""
default_project_key = "__default_project__"
def __init__(self, local_site_id=None):
# Get mongo connection
@ -545,7 +546,7 @@ class MongoLocalSettingshandler(LocalSettingsHandler):
self.local_site_id = local_site_id
self.settings_cache = CacheValues()
self.local_settings_cache = CacheValues()
def save_local_settings(self, data):
"""Save local settings.
@ -553,7 +554,15 @@ class MongoLocalSettingshandler(LocalSettingsHandler):
Args:
data(dict): Data of studio overrides with override metadata.
"""
self.settings_cache.update_data(data)
data = data or {}
# Replace key `None` (default project values) with constant string
if "projects" in data and None in data["projects"]:
data["projects"][self.default_project_key] = (
data["projects"].pop(None)
)
self.local_settings_cache.update_data(data)
self.collection.replace_one(
{
@ -563,18 +572,27 @@ class MongoLocalSettingshandler(LocalSettingsHandler):
{
"type": LOCAL_SETTING_KEY,
"site_id": self.local_site_id,
"value": self.settings_cache.to_json_string()
"value": self.local_settings_cache.to_json_string()
},
upsert=True
)
def get_local_settings(self):
"""Local settings for local site id."""
if self.settings_cache.is_outdated:
if self.local_settings_cache.is_outdated:
document = self.collection.find_one({
"type": LOCAL_SETTING_KEY,
"site_id": self.local_site_id
})
self.settings_cache.update_from_document(document)
return self.settings_cache.data_copy()
self.local_settings_cache.update_from_document(document)
data = self.local_settings_cache.data
if (
"projects" in data
and self.default_project_key in data["projects"]
):
data["projects"][None] = data["projects"].pop(
self.default_project_key
)
return self.local_settings_cache.data_copy()