From 5ac2bf54196ef2487776266ce11d7adef6cac277 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 17 Mar 2020 15:04:14 +0100 Subject: [PATCH 01/17] initial commit system storage was split into two parts --- anatomy/roots.json | 14 ++++++++++++++ system/core.json | 12 ++++++++++++ system/storage.json | 28 ---------------------------- system/storage_schema.json | 1 - 4 files changed, 26 insertions(+), 29 deletions(-) create mode 100644 anatomy/roots.json create mode 100644 system/core.json delete mode 100644 system/storage.json delete mode 100644 system/storage_schema.json diff --git a/anatomy/roots.json b/anatomy/roots.json new file mode 100644 index 0000000..680780f --- /dev/null +++ b/anatomy/roots.json @@ -0,0 +1,14 @@ +{ + "projects": { + "path": { + "windows": "D:/projects", + "darwin": "", + "linux": "/mnt/share/projects" + }, + "mount": { + "windows": "D:/projects", + "darwin": "", + "linux": "/mnt/share/core" + } + } +} diff --git a/system/core.json b/system/core.json new file mode 100644 index 0000000..b5e7d59 --- /dev/null +++ b/system/core.json @@ -0,0 +1,12 @@ +{ + "path": { + "windows": "//network/path/to/core", + "darwin": "", + "linux": "/mnt/share/core" + }, + "mount": { + "windows": "K:/network/path/to/core", + "darwin": "", + "linux": "/mnt/share/core" + } +} diff --git a/system/storage.json b/system/storage.json deleted file mode 100644 index 6fb1902..0000000 --- a/system/storage.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "studio": { - "projects": { - "path": { - "windows": "//network/path/to/projects", - "darwin": "", - "linux": "/mnt/share/projects" - }, - "mount": { - "windows": "P:/mounted/path/to/projects", - "darwin": "", - "linux": "/mnt/share/core" - } - }, - "core": { - "path": { - "windows": "//network/path/to/core", - "darwin": "", - "linux": "/mnt/share/core" - }, - "mount": { - "windows": "K:/network/path/to/core", - "darwin": "", - "linux": "/mnt/share/core" - } - } - } -} diff --git a/system/storage_schema.json b/system/storage_schema.json deleted file mode 100644 index 0967ef4..0000000 --- a/system/storage_schema.json +++ /dev/null @@ -1 +0,0 @@ -{} From 16f2954872355e7a395ce090e483110e1fd1cc12 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 17 Mar 2020 17:59:30 +0100 Subject: [PATCH 02/17] changed AVALON_PROEJCTS env value to default mount for backwards compatibility --- anatomy/roots.json | 2 +- environments/avalon.json | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/anatomy/roots.json b/anatomy/roots.json index 680780f..eb07d8b 100644 --- a/anatomy/roots.json +++ b/anatomy/roots.json @@ -8,7 +8,7 @@ "mount": { "windows": "D:/projects", "darwin": "", - "linux": "/mnt/share/core" + "linux": "/mnt/share/projects" } } } diff --git a/environments/avalon.json b/environments/avalon.json index b965c45..d09cb8e 100644 --- a/environments/avalon.json +++ b/environments/avalon.json @@ -1,6 +1,9 @@ { "AVALON_CONFIG": "pype", - "AVALON_PROJECTS": "{PYPE_STUDIO_PROJECTS_MOUNT}", + "AVALON_PROJECTS": { + "windows": "K:/network/path/to/core", + "linux": "/mnt/share/projects" + }, "AVALON_USERNAME": "avalon", "AVALON_PASSWORD": "secret", "AVALON_DEBUG": "1", From ebeb4bcf68b08a6211c63b0fc195ae25d73108bd Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 17 Mar 2020 18:22:43 +0100 Subject: [PATCH 03/17] PYPE_STUDIO_CORE_MOUNT replaced with PYPE_CORE_MOUNT --- environments/global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/global.json b/environments/global.json index fabcc1e..bf946c8 100644 --- a/environments/global.json +++ b/environments/global.json @@ -4,7 +4,7 @@ "PYPE_APP_ROOT": "{PYPE_ROOT}/pypeapp", "PYPE_MODULE_ROOT": "{PYPE_ROOT}/repos/pype", "PYPE_PROJECT_PLUGINS": "", - "STUDIO_SOFT": "{PYPE_STUDIO_CORE_MOUNT}/soft", + "STUDIO_SOFT": "{PYPE_CORE_MOUNT}/soft", "FFMPEG_PATH": { "windows": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/windows/bin", "linux": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/linux" From 65bb0091f871b50b6bef18a25b4bd12f54c24f82 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 18 Mar 2020 11:47:27 +0100 Subject: [PATCH 04/17] PYPE_PROJECT_PATH and _MOUNT must stay for backwards compatibility --- anatomy/roots.json | 4 ++-- environments/avalon.json | 5 +---- environments/global.json | 8 ++++++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/anatomy/roots.json b/anatomy/roots.json index eb07d8b..7944e7b 100644 --- a/anatomy/roots.json +++ b/anatomy/roots.json @@ -1,12 +1,12 @@ { "projects": { "path": { - "windows": "D:/projects", + "windows": "K:/network/path/to/core", "darwin": "", "linux": "/mnt/share/projects" }, "mount": { - "windows": "D:/projects", + "windows": "//network/path/to/core", "darwin": "", "linux": "/mnt/share/projects" } diff --git a/environments/avalon.json b/environments/avalon.json index d09cb8e..e76001f 100644 --- a/environments/avalon.json +++ b/environments/avalon.json @@ -1,9 +1,6 @@ { "AVALON_CONFIG": "pype", - "AVALON_PROJECTS": { - "windows": "K:/network/path/to/core", - "linux": "/mnt/share/projects" - }, + "AVALON_PROJECTS": "{PYPE_PROJECTS_PATH}", "AVALON_USERNAME": "avalon", "AVALON_PASSWORD": "secret", "AVALON_DEBUG": "1", diff --git a/environments/global.json b/environments/global.json index bf946c8..796f7eb 100644 --- a/environments/global.json +++ b/environments/global.json @@ -21,6 +21,14 @@ "{FFMPEG_PATH}" ], + "PYPE_PROJECTS_PATH": { + "windows": "K:/network/path/to/core", + "linux": "/mnt/share/projects" + }, + "PYPE_PROJECTS_MOUNT": { + "windows": "//network/path/to/core", + "linux": "/mnt/share/projects" + }, "PYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs", "PYTHONPATH": "{VIRTUAL_ENV}/Lib/site-packages", "PYPE_PROJECT_CONFIGS": "{PYPE_ROOT}/../studio-project-configs", From 1c7dcd9aaf83b41d083022c8ebfd662d2603f649 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 18 Mar 2020 16:36:49 +0100 Subject: [PATCH 05/17] use inner keys in anatomy --- anatomy/default.yaml | 36 ++++++++++++++++++++++-------------- presets/tools/burnins.json | 2 +- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/anatomy/default.yaml b/anatomy/default.yaml index 29ce54b..4cc7847 100644 --- a/anatomy/default.yaml +++ b/anatomy/default.yaml @@ -29,30 +29,38 @@ # # {representation}: str, example: abc, ma, nk, exr, png, curves, history, metadata # ''' +root_type: "projects" +root: "{root[{@root_type}]}" +version_padding: 3 +version: "v{version:0>{@version_padding}}" +frame_padding: 4 +frame: "{frame:0>{@frame_padding}}" resources: - footage: "{root}/{project[name]}/resources/footage" - reference: "{root}/{project[name]}/resources/reference" + footage: "{@root}/{project[name]}/resources/footage" + reference: "{@root}/{project[name]}/resources/reference" work: - folder: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}" - file: "{project[code]}_{asset}_{task}_v{version:0>3}<_{comment}>.{ext}" - path: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}/{project[code]}_{asset}_{task}_v{version:0>3}<_{comment}>.{ext}" + root_type: "another_projects" + folder: "{@root}/{project[name]}/{hierarchy}/{asset}/work/{task}" + file: "{project[code]}_{asset}_{task}_{@version}<_{comment}>.{ext}" + path: "{@folder}/{@file}" render: - padding: "4" - path: "{root}/{project[name]}/{hierarchy}/{asset}/publish/render/{subset}/v{version:0>3}/{project[code]}_{asset}_{task}_v{version:0>3}_{subset}<_{output}><.{frame}>.{representation}" + folder: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/render/{subset}/{@version}" + file: "{project[code]}_{asset}_{task}_{@version}_{subset}<_{output}><.{@frame}>.{representation}" + path: "{@folder}/{@file}" texture: - path: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}" + path: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}" publish: - burninVersion: "v{version:0>3}" - path: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version:0>3}/{project[code]}_{asset}_{subset}_v{version:0>3}<_{output}><.{frame}>.{representation}" - folder: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version:0>3}" + folder: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}" + file: "{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{representation}" + path: "{@folder}/{@file}" thumbnail: "{thumbnail_root}/{project[name]}/{_id}_{thumbnail_type}{ext}" avalon: - workfile: "{project[code]}_{asset}_{task}_v{version:0>3}<_{comment}>" - work: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}" - publish: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version:0>3}/{project[code]}_{asset}_{subset}_v{version:0>3}<_{output}><.{frame}>.{representation}" + work: "{@root}/{project[name]}/{hierarchy}/{asset}/work/{task}" + workfile: "{project[code]}_{asset}_{task}_{@version}<_{comment}>" + publish: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}/{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{representation}" diff --git a/presets/tools/burnins.json b/presets/tools/burnins.json index b3c16bc..4041718 100644 --- a/presets/tools/burnins.json +++ b/presets/tools/burnins.json @@ -14,7 +14,7 @@ ], "burnins":{ "TOP_LEFT": "{yy}-{mm}-{dd}", - "TOP_RIGHT": "{anatomy[publish][burninVersion]}", + "TOP_RIGHT": "{anatomy[publish][version]}", "TOP_CENTERED": "tc: {timecode}", "BOTTOM_RIGHT": "{frame_start}-{current_frame}-{frame_end}", "BOTTOM_CENTERED": "{asset}", From d16535b43f5aa5f745a7d8eb7c420e3ff0666fc3 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 20 Mar 2020 16:32:40 +0100 Subject: [PATCH 06/17] modified root --- anatomy/default.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/anatomy/default.yaml b/anatomy/default.yaml index 300210b..ece28a6 100644 --- a/anatomy/default.yaml +++ b/anatomy/default.yaml @@ -29,13 +29,9 @@ # # {representation}: str, example: abc, ma, nk, exr, png, curves, history, metadata # ''' -root_type: "projects" -root: "{root[{@root_type}]}" -version_padding: 3 -version: "v{version:0>{@version_padding}}" -frame_padding: 4 -frame: "{frame:0>{@frame_padding}}" - +root_name: "projects" +root_type: "mount" +root: "{root[{@root_name}][{@root_type}]}" version_padding: 3 version: "v{version:0>{@version_padding}}" frame_padding: 4 @@ -46,7 +42,7 @@ resources: reference: "{@root}/{project[name]}/resources/reference" work: - root_type: "another_projects" + root_type: "path" folder: "{@root}/{project[name]}/{hierarchy}/{asset}/work/{task}" file: "{project[code]}_{asset}_{task}_{@version}<_{comment}>.{ext}" path: "{@folder}/{@file}" From 133440b8f9851cb3b9b74fb4be0e24478bcb81fd Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Mon, 30 Mar 2020 11:46:05 +0200 Subject: [PATCH 07/17] root_type removed --- anatomy/default.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/anatomy/default.yaml b/anatomy/default.yaml index ece28a6..bcf87e0 100644 --- a/anatomy/default.yaml +++ b/anatomy/default.yaml @@ -30,8 +30,7 @@ # {representation}: str, example: abc, ma, nk, exr, png, curves, history, metadata # ''' root_name: "projects" -root_type: "mount" -root: "{root[{@root_name}][{@root_type}]}" +root: "{root[{@root_name}]}" version_padding: 3 version: "v{version:0>{@version_padding}}" frame_padding: 4 @@ -42,7 +41,6 @@ resources: reference: "{@root}/{project[name]}/resources/reference" work: - root_type: "path" folder: "{@root}/{project[name]}/{hierarchy}/{asset}/work/{task}" file: "{project[code]}_{asset}_{task}_{@version}<_{comment}>.{ext}" path: "{@folder}/{@file}" From 1c8f96d3b399f402aec99c35809910b4e64794e0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 9 Apr 2020 12:16:09 +0200 Subject: [PATCH 08/17] roots are not separated into path/mount --- anatomy/roots.json | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/anatomy/roots.json b/anatomy/roots.json index 7944e7b..0e87050 100644 --- a/anatomy/roots.json +++ b/anatomy/roots.json @@ -1,14 +1,7 @@ { "projects": { - "path": { - "windows": "K:/network/path/to/core", - "darwin": "", - "linux": "/mnt/share/projects" - }, - "mount": { - "windows": "//network/path/to/core", - "darwin": "", - "linux": "/mnt/share/projects" - } + "windows": "P:/projects", + "linux": "/mnt/share/projects", + "darwin": "/darwin/path" } } From 6de7d73ce6c82d828e7b7f56e8765d0b6f1076c0 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 9 Apr 2020 12:44:31 +0200 Subject: [PATCH 09/17] replaced "PYPE_ROOT" with "PYPE_SETUP_PATH" --- environments/aport.json | 2 +- environments/avalon.json | 4 ++-- environments/blender.json | 4 ++-- environments/ftrack.json | 4 ++-- environments/global.json | 10 +++++----- environments/maya.json | 4 ++-- environments/mayabatch.json | 4 ++-- environments/nuke.json | 2 +- environments/nukex.json | 2 +- environments/unreal_4.24.json | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/environments/aport.json b/environments/aport.json index 5d7293e..f646329 100644 --- a/environments/aport.json +++ b/environments/aport.json @@ -1,5 +1,5 @@ { - "APORT_PATH": "{PYPE_ROOT}/repos/avalon-core/setup/aport/pythonpath", + "APORT_PATH": "{PYPE_SETUP_PATH}/repos/avalon-core/setup/aport/pythonpath", "PICO_IP": "{AVALON_LOCATION}", "PICO_PORT": 4242, "PICO_DEBUG": false, diff --git a/environments/avalon.json b/environments/avalon.json index e76001f..bfaa1a0 100644 --- a/environments/avalon.json +++ b/environments/avalon.json @@ -7,9 +7,9 @@ "AVALON_MONGO_PORT": "2707", "AVALON_MONGO": "mongodb://localhost:{AVALON_MONGO_PORT}", "AVALON_DB": "avalon", - "AVALON_DB_DATA": "{PYPE_ROOT}/../mongo_db_data", + "AVALON_DB_DATA": "{PYPE_SETUP_PATH}/../mongo_db_data", "AVALON_EARLY_ADOPTER": "1", - "AVALON_SCHEMA": "{PYPE_MODULE_ROOT}/schema", + "AVALON_SCHEMA": "{PYPE_MODULE_ROOT}_multiroot/schema", "AVALON_LOCATION": "http://127.0.0.1", "AVALON_LABEL": "Pype", "AVALON_TIMEOUT": "1000", diff --git a/environments/blender.json b/environments/blender.json index d51b5f1..f2bdcdb 100644 --- a/environments/blender.json +++ b/environments/blender.json @@ -1,6 +1,6 @@ { - "BLENDER_USER_SCRIPTS": "{PYPE_ROOT}/repos/avalon-core/setup/blender", - "PYTHONPATH": ["{PYPE_ROOT}/repos/avalon-core/setup/blender"], + "BLENDER_USER_SCRIPTS": "{PYPE_SETUP_PATH}/repos/avalon-core/setup/blender", + "PYTHONPATH": ["{PYPE_SETUP_PATH}/repos/avalon-core/setup/blender"], "PYBLISH_GUI": [ "pyblish_lite" ] diff --git a/environments/ftrack.json b/environments/ftrack.json index a139052..d0ce70a 100644 --- a/environments/ftrack.json +++ b/environments/ftrack.json @@ -6,10 +6,10 @@ "FTRACK_EVENTS_PATH": [ "{PYPE_MODULE_ROOT}/pype/ftrack/events" ], - "FTRACK_ACTION_SERVER": "{PYPE_ROOT}/repos/ftrack-event-server", + "FTRACK_ACTION_SERVER": "{PYPE_SETUP_PATH}/repos/ftrack-event-server", "PYTHONPATH": [ "{PYPE_MODULE_ROOT}/pype/vendor", - "{PYPE_ROOT}/repos/ftrack-event-server" + "{PYPE_SETUP_PATH}/repos/ftrack-event-server" ], "PYBLISHPLUGINPATH": [ "{PYPE_MODULE_ROOT}/pype/plugins/ftrack/publish" diff --git a/environments/global.json b/environments/global.json index 796f7eb..b4b9c9c 100644 --- a/environments/global.json +++ b/environments/global.json @@ -1,13 +1,13 @@ { "PYPE_STUDIO_NAME": "Studio Name", "PYPE_STUDIO_CODE": "stu", - "PYPE_APP_ROOT": "{PYPE_ROOT}/pypeapp", - "PYPE_MODULE_ROOT": "{PYPE_ROOT}/repos/pype", + "PYPE_APP_ROOT": "{PYPE_SETUP_PATH}/pypeapp", + "PYPE_MODULE_ROOT": "{PYPE_SETUP_PATH}/repos/pype", "PYPE_PROJECT_PLUGINS": "", "STUDIO_SOFT": "{PYPE_CORE_MOUNT}/soft", "FFMPEG_PATH": { - "windows": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/windows/bin", - "linux": "{PYPE_ROOT}/vendor/bin/ffmpeg_exec/linux" + "windows": "{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin", + "linux": "{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux" }, "DJV_PATH": { "windows": "{STUDIO_SOFT}/djv/windows/bin", @@ -31,7 +31,7 @@ }, "PYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs", "PYTHONPATH": "{VIRTUAL_ENV}/Lib/site-packages", - "PYPE_PROJECT_CONFIGS": "{PYPE_ROOT}/../studio-project-configs", + "PYPE_PROJECT_CONFIGS": "{PYPE_SETUP_PATH}/../studio-project-configs", "PYPE_PYTHON_EXE": { "windows": "{VIRTUAL_ENV}/Scripts/python.exe", "linux": "{VIRTUAL_ENV}/Scripts/python" diff --git a/environments/maya.json b/environments/maya.json index ee3cf40..1c65995 100644 --- a/environments/maya.json +++ b/environments/maya.json @@ -1,7 +1,7 @@ { "PYTHONPATH": [ - "{PYPE_ROOT}/repos/avalon-core/setup/maya", - "{PYPE_ROOT}/repos/maya-look-assigner", + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/maya", + "{PYPE_SETUP_PATH}/repos/maya-look-assigner", "{PYTHON_ENV}/python2/Lib/site-packages" ], "MAYA_DISABLE_CLIC_IPM": "Yes", diff --git a/environments/mayabatch.json b/environments/mayabatch.json index ee3cf40..1c65995 100644 --- a/environments/mayabatch.json +++ b/environments/mayabatch.json @@ -1,7 +1,7 @@ { "PYTHONPATH": [ - "{PYPE_ROOT}/repos/avalon-core/setup/maya", - "{PYPE_ROOT}/repos/maya-look-assigner", + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/maya", + "{PYPE_SETUP_PATH}/repos/maya-look-assigner", "{PYTHON_ENV}/python2/Lib/site-packages" ], "MAYA_DISABLE_CLIC_IPM": "Yes", diff --git a/environments/nuke.json b/environments/nuke.json index d25ada8..fde0a0f 100644 --- a/environments/nuke.json +++ b/environments/nuke.json @@ -3,7 +3,7 @@ "pyblish_lite" ], "NUKE_PATH": [ - "{PYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path", + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/nuke/nuke_path", "{PYPE_MODULE_ROOT}/setup/nuke/nuke_path", "{PYPE_STUDIO_PLUGINS}/nuke" ], diff --git a/environments/nukex.json b/environments/nukex.json index 62b3821..b51597c 100644 --- a/environments/nukex.json +++ b/environments/nukex.json @@ -3,7 +3,7 @@ "pyblish_lite" ], "NUKE_PATH": [ - "{PYPE_ROOT}/repos/avalon-core/setup/nuke/nuke_path", + "{PYPE_SETUP_PATH}/repos/avalon-core/setup/nuke/nuke_path", "{PYPE_MODULE_ROOT}/setup/nuke/nuke_path", "{PYPE_STUDIO_PLUGINS}/nuke" ], diff --git a/environments/unreal_4.24.json b/environments/unreal_4.24.json index d7b2aae..8feeb02 100644 --- a/environments/unreal_4.24.json +++ b/environments/unreal_4.24.json @@ -1,5 +1,5 @@ { - "AVALON_UNREAL_PLUGIN": "{PYPE_ROOT}/repos/avalon-unreal-integration", + "AVALON_UNREAL_PLUGIN": "{PYPE_SETUP_PATH}/repos/avalon-unreal-integration", "PYPE_LOG_NO_COLORS": "True", "QT_PREFERRED_BINDING": "PySide" } From 0dc14d4aa3ba9fab58e99f51cac5a3e39e7b44a5 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 9 Apr 2020 18:18:05 +0200 Subject: [PATCH 10/17] remove unnecessary --- environments/global.json | 8 -------- system/core.json | 12 ------------ 2 files changed, 20 deletions(-) delete mode 100644 system/core.json diff --git a/environments/global.json b/environments/global.json index b4b9c9c..b542fad 100644 --- a/environments/global.json +++ b/environments/global.json @@ -21,14 +21,6 @@ "{FFMPEG_PATH}" ], - "PYPE_PROJECTS_PATH": { - "windows": "K:/network/path/to/core", - "linux": "/mnt/share/projects" - }, - "PYPE_PROJECTS_MOUNT": { - "windows": "//network/path/to/core", - "linux": "/mnt/share/projects" - }, "PYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs", "PYTHONPATH": "{VIRTUAL_ENV}/Lib/site-packages", "PYPE_PROJECT_CONFIGS": "{PYPE_SETUP_PATH}/../studio-project-configs", diff --git a/system/core.json b/system/core.json deleted file mode 100644 index b5e7d59..0000000 --- a/system/core.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "path": { - "windows": "//network/path/to/core", - "darwin": "", - "linux": "/mnt/share/core" - }, - "mount": { - "windows": "K:/network/path/to/core", - "darwin": "", - "linux": "/mnt/share/core" - } -} From c2afe37059f6394b95a15ce19834f6273b29179d Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Thu, 9 Apr 2020 18:18:21 +0200 Subject: [PATCH 11/17] temporarily added PYP_SETUP_ROOT to environments --- environments/global.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environments/global.json b/environments/global.json index b542fad..84e40b2 100644 --- a/environments/global.json +++ b/environments/global.json @@ -1,10 +1,11 @@ { "PYPE_STUDIO_NAME": "Studio Name", "PYPE_STUDIO_CODE": "stu", + "PYP_SETUP_ROOT": "../", "PYPE_APP_ROOT": "{PYPE_SETUP_PATH}/pypeapp", "PYPE_MODULE_ROOT": "{PYPE_SETUP_PATH}/repos/pype", "PYPE_PROJECT_PLUGINS": "", - "STUDIO_SOFT": "{PYPE_CORE_MOUNT}/soft", + "STUDIO_SOFT": "{PYP_SETUP_ROOT}/soft", "FFMPEG_PATH": { "windows": "{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin", "linux": "{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux" From b25d2eb9093644eeb07399358021a57196e36297 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 10 Apr 2020 14:23:32 +0200 Subject: [PATCH 12/17] fix avalon schema --- environments/avalon.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/avalon.json b/environments/avalon.json index bfaa1a0..0067de5 100644 --- a/environments/avalon.json +++ b/environments/avalon.json @@ -9,7 +9,7 @@ "AVALON_DB": "avalon", "AVALON_DB_DATA": "{PYPE_SETUP_PATH}/../mongo_db_data", "AVALON_EARLY_ADOPTER": "1", - "AVALON_SCHEMA": "{PYPE_MODULE_ROOT}_multiroot/schema", + "AVALON_SCHEMA": "{PYPE_MODULE_ROOT}/schema", "AVALON_LOCATION": "http://127.0.0.1", "AVALON_LABEL": "Pype", "AVALON_TIMEOUT": "1000", From 7077e2dba47dde13102b7a69d776090b45a84ab7 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 14 Apr 2020 18:43:06 +0200 Subject: [PATCH 13/17] removed avalon from default anatomy --- anatomy/default.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/anatomy/default.yaml b/anatomy/default.yaml index fecb820..bd50a7f 100644 --- a/anatomy/default.yaml +++ b/anatomy/default.yaml @@ -62,8 +62,3 @@ publish: master: path: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master/{project[code]}_{asset}_{subset}_master<_{output}><.{frame}>.{representation}" folder: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master" - -avalon: - work: "{@root}/{project[name]}/{hierarchy}/{asset}/work/{task}" - workfile: "{project[code]}_{asset}_{task}_{@version}<_{comment}>" - publish: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}/{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{representation}" From 1b34b343a701aef232d71a02b7762df114bfdab7 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 14 Apr 2020 19:56:12 +0200 Subject: [PATCH 14/17] Modified default roots and anatomy --- anatomy/default.yaml | 8 +++++--- anatomy/roots.json | 13 +++++++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/anatomy/default.yaml b/anatomy/default.yaml index bd50a7f..f0db48f 100644 --- a/anatomy/default.yaml +++ b/anatomy/default.yaml @@ -29,7 +29,7 @@ # # {representation}: str, example: abc, ma, nk, exr, png, curves, history, metadata # ''' -root_name: "projects" +root_name: "publish" root: "{root[{@root_name}]}" version_padding: 3 version: "v{version:0>{@version_padding}}" @@ -41,6 +41,7 @@ resources: reference: "{@root}/{project[name]}/resources/reference" work: + root_name: "work" folder: "{@root}/{project[name]}/{hierarchy}/{asset}/work/{task}" file: "{project[code]}_{asset}_{task}_{@version}<_{comment}>.{ext}" path: "{@folder}/{@file}" @@ -60,5 +61,6 @@ publish: thumbnail: "{thumbnail_root}/{project[name]}/{_id}_{thumbnail_type}{ext}" master: - path: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master/{project[code]}_{asset}_{subset}_master<_{output}><.{frame}>.{representation}" - folder: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master" + folder: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master" + file: "{project[code]}_{asset}_{subset}_master<_{output}><.{frame}>.{representation}" + path: "{@folder}/{@file}" diff --git a/anatomy/roots.json b/anatomy/roots.json index 0e87050..7d4ebc4 100644 --- a/anatomy/roots.json +++ b/anatomy/roots.json @@ -1,7 +1,12 @@ { - "projects": { - "windows": "P:/projects", - "linux": "/mnt/share/projects", - "darwin": "/darwin/path" + "work": { + "windows": "P:/projects/work", + "linux": "/mnt/share/projects/work", + "darwin": "/darwin/path/work" + }, + "publish": { + "windows": "P:/projects/publish", + "linux": "/mnt/share/projects/publish", + "darwin": "/darwin/path/publish" } } From e87eddc8577b6701aa1bcdcb73b1f0327c368b7f Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 17 Apr 2020 09:31:18 +0200 Subject: [PATCH 15/17] skip root with inner keys --- anatomy/default.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/anatomy/default.yaml b/anatomy/default.yaml index f0db48f..d49c76e 100644 --- a/anatomy/default.yaml +++ b/anatomy/default.yaml @@ -29,38 +29,35 @@ # # {representation}: str, example: abc, ma, nk, exr, png, curves, history, metadata # ''' -root_name: "publish" -root: "{root[{@root_name}]}" version_padding: 3 version: "v{version:0>{@version_padding}}" frame_padding: 4 frame: "{frame:0>{@frame_padding}}" resources: - footage: "{@root}/{project[name]}/resources/footage" + footage: "{root[work]}/{project[name]}/resources/footage" reference: "{@root}/{project[name]}/resources/reference" work: - root_name: "work" - folder: "{@root}/{project[name]}/{hierarchy}/{asset}/work/{task}" + folder: "{root[work]}/{project[name]}/{hierarchy}/{asset}/work/{task}" file: "{project[code]}_{asset}_{task}_{@version}<_{comment}>.{ext}" path: "{@folder}/{@file}" render: - folder: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/render/{subset}/{@version}" + folder: "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/render/{subset}/{@version}" file: "{project[code]}_{asset}_{task}_{@version}_{subset}<_{output}><.{@frame}>.{representation}" path: "{@folder}/{@file}" texture: - path: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}" + path: "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}" publish: - folder: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}" + folder: "{root[publish]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}" file: "{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{representation}" path: "{@folder}/{@file}" thumbnail: "{thumbnail_root}/{project[name]}/{_id}_{thumbnail_type}{ext}" master: - folder: "{@root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master" + folder: "{root[publish]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master" file: "{project[code]}_{asset}_{subset}_master<_{output}><.{frame}>.{representation}" path: "{@folder}/{@file}" From 73b01af448f27270eed7ed4248a89b1b82b59740 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 17 Apr 2020 09:59:06 +0200 Subject: [PATCH 16/17] remove PYP_SETUP_ROOT from global.json --- environments/global.json | 1 - 1 file changed, 1 deletion(-) diff --git a/environments/global.json b/environments/global.json index 84e40b2..adca072 100644 --- a/environments/global.json +++ b/environments/global.json @@ -1,7 +1,6 @@ { "PYPE_STUDIO_NAME": "Studio Name", "PYPE_STUDIO_CODE": "stu", - "PYP_SETUP_ROOT": "../", "PYPE_APP_ROOT": "{PYPE_SETUP_PATH}/pypeapp", "PYPE_MODULE_ROOT": "{PYPE_SETUP_PATH}/repos/pype", "PYPE_PROJECT_PLUGINS": "", From d275bbeb61aa403086a7ca4a8ba6dfcd6097b5ed Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 17 Apr 2020 10:02:14 +0200 Subject: [PATCH 17/17] one more {@root} replaced --- anatomy/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anatomy/default.yaml b/anatomy/default.yaml index d49c76e..3958d05 100644 --- a/anatomy/default.yaml +++ b/anatomy/default.yaml @@ -36,7 +36,7 @@ frame: "{frame:0>{@frame_padding}}" resources: footage: "{root[work]}/{project[name]}/resources/footage" - reference: "{@root}/{project[name]}/resources/reference" + reference: "{root[work]}/{project[name]}/resources/reference" work: folder: "{root[work]}/{project[name]}/{hierarchy}/{asset}/work/{task}"