Merge pull request #17 from pypeclub/feature/PYPE-762_multi_root

Feature/PYPE-762 multi root
ynput · May 12, 2020 · bc6c541 · bc6c541
2 parents 86d5a7b + c487c76
commit bc6c541
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 62 deletions.
diff --git a/anatomy/default.yaml b/anatomy/default.yaml
@@ -5,30 +5,25 @@ frame_padding: 4
 frame: "{frame:0>{@frame_padding}}"
 
 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: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}/{project[code]}_{asset}_{task}_{@version}<_{comment}>.{ext}"
+ path: "{@folder}/{@file}"
 
 render:
- padding: "4"
- folder: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}"
- file: "{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{representation}"
+ 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:
- 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:
- workfile: "{project[code]}_{asset}_{task}_{@version}<_{comment}>"
- work: "{root}/{project[name]}/{hierarchy}/{asset}/work/{task}"
- publish: "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}/{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{representation}"
+ folder: "{root[publish]}/{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
@@ -0,0 +1,12 @@
+{
+ "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"
+ }
+}
diff --git a/environments/avalon.json b/environments/avalon.json
@@ -1,13 +1,13 @@
 {
  "AVALON_CONFIG": "pype",
- "AVALON_PROJECTS": "{PYPE_STUDIO_PROJECTS_MOUNT}",
+ "AVALON_PROJECTS": "{PYPE_PROJECTS_PATH}",
  "AVALON_USERNAME": "avalon",
  "AVALON_PASSWORD": "secret",
  "AVALON_DEBUG": "1",
  "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_LOCATION": "http://127.0.0.1",

diff --git 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
@@ -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
@@ -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_STUDIO_CORE_MOUNT}/soft",
+ "STUDIO_SOFT": "{PYP_SETUP_ROOT}/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",
@@ -23,7 +23,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 }
diff --git a/system/storage.json b/system/storage.json
diff --git a/system/storage_schema.json b/system/storage_schema.json