From b7cb00650863ad3d25aaa01ef4e35547b65c7633 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Fri, 12 Nov 2021 20:13:20 +0100 Subject: [PATCH] Fix - wrong key used, return back to 'root' instead of 'roots' 'root' follow existing pattern (in Anatomy etc.) --- openpype/lib/path_tools.py | 2 +- .../modules/default_modules/sync_server/providers/dropbox.py | 4 ++-- .../modules/default_modules/sync_server/providers/gdrive.py | 4 ++-- .../default_modules/sync_server/providers/local_drive.py | 4 ++-- .../modules/default_modules/sync_server/providers/sftp.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openpype/lib/path_tools.py b/openpype/lib/path_tools.py index c7ee63d50b..6fd0ad0dfe 100644 --- a/openpype/lib/path_tools.py +++ b/openpype/lib/path_tools.py @@ -342,7 +342,7 @@ class HostDirmap: log.debug("remote overrides".format(remote_overrides)) for root_name, active_site_dir in active_overrides.items(): remote_site_dir = remote_overrides.get(root_name) or\ - sync_settings["sites"][remote_site]["roots"][root_name] + sync_settings["sites"][remote_site]["root"][root_name] if os.path.isdir(active_site_dir): if not mapping.get("destination-path"): mapping["destination-path"] = [] diff --git a/openpype/modules/default_modules/sync_server/providers/dropbox.py b/openpype/modules/default_modules/sync_server/providers/dropbox.py index 84a540be5d..90d7d44bb8 100644 --- a/openpype/modules/default_modules/sync_server/providers/dropbox.py +++ b/openpype/modules/default_modules/sync_server/providers/dropbox.py @@ -97,7 +97,7 @@ class DropboxHandler(AbstractProvider): }, # roots could be overriden only on Project level, User cannot { - "key": "roots", + "key": "root", "label": "Roots", "type": "dict-roots", "object_type": { @@ -389,7 +389,7 @@ class DropboxHandler(AbstractProvider): {"root": {"root_ONE": "value", "root_TWO":"value}} Format is importing for usage of python's format ** approach """ - return self.presets['roots'] + return self.presets['root'] def resolve_path(self, path, root_config=None, anatomy=None): """ diff --git a/openpype/modules/default_modules/sync_server/providers/gdrive.py b/openpype/modules/default_modules/sync_server/providers/gdrive.py index a5b68a12c3..d43e2b3d61 100644 --- a/openpype/modules/default_modules/sync_server/providers/gdrive.py +++ b/openpype/modules/default_modules/sync_server/providers/gdrive.py @@ -129,7 +129,7 @@ class GDriveHandler(AbstractProvider): }, # roots could be overriden only on Project leve, User cannot { - "key": "roots", + "key": "root", "label": "Roots", "type": "dict-roots", "object_type": { @@ -174,7 +174,7 @@ class GDriveHandler(AbstractProvider): Format is importing for usage of python's format ** approach """ # GDrive roots cannot be locally overridden - return self.presets['roots'] + return self.presets['root'] def get_tree(self): """ diff --git a/openpype/modules/default_modules/sync_server/providers/local_drive.py b/openpype/modules/default_modules/sync_server/providers/local_drive.py index e6ed918981..68f604b39c 100644 --- a/openpype/modules/default_modules/sync_server/providers/local_drive.py +++ b/openpype/modules/default_modules/sync_server/providers/local_drive.py @@ -50,7 +50,7 @@ class LocalDriveHandler(AbstractProvider): # for non 'studio' sites, 'studio' is configured in Anatomy editable = [ { - "key": "roots", + "key": "root", "label": "Roots", "type": "dict-roots", "object_type": { @@ -73,7 +73,7 @@ class LocalDriveHandler(AbstractProvider): """ editable = [ { - 'key': "roots", + 'key': "root", 'label': "Roots", 'type': 'dict' } diff --git a/openpype/modules/default_modules/sync_server/providers/sftp.py b/openpype/modules/default_modules/sync_server/providers/sftp.py index 768221d6b8..4f505ae016 100644 --- a/openpype/modules/default_modules/sync_server/providers/sftp.py +++ b/openpype/modules/default_modules/sync_server/providers/sftp.py @@ -131,7 +131,7 @@ class SFTPHandler(AbstractProvider): }, # roots could be overriden only on Project leve, User cannot { - "key": "roots", + "key": "root", "label": "Roots", "type": "dict-roots", "object_type": {