Merge pull request #1014 from pypeclub/feature/1010-unify-the-use-of-…

…single-and-multi-root-templates

Unify the use of single and multi root templates

pype/settings/defaults/project_anatomy/roots.json

@@ -1,5 +1,7 @@
 {
- "windows": "C:/projects",
- "darwin": "/Volumes/path",
- "linux": "/mnt/share/projects"
+ "work": {
+ "windows": "C:/projects",
+ "darwin": "/Volumes/path",
+ "linux": "/mnt/share/projects"
+ }
 }

pype/settings/defaults/project_anatomy/templates.json

@@ -4,23 +4,23 @@
  "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": "{@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}_{subset}_{@version}<_{output}><.{@frame}>.{ext}",
  "path": "{@folder}/{@file}"
  },
  "publish": {
- "folder": "{root}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}",
+ "folder": "{root[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/{@version}",
  "file": "{project[code]}_{asset}_{subset}_{@version}<_{output}><.{@frame}>.{ext}",
  "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[work]}/{project[name]}/{hierarchy}/{asset}/publish/{family}/{subset}/master",
  "file": "{project[code]}_{asset}_{subset}_master<_{output}><.{frame}>.{ext}",
  "path": "{@folder}/{@file}"
  },

pype/settings/lib.py

@@ -333,7 +333,14 @@ def get_default_anatomy_settings(clear_metadata=True):
  """Project anatomy data with applied studio's default project overrides."""
  default_values = get_default_settings()[PROJECT_ANATOMY_KEY]
  studio_values = get_studio_project_anatomy_overrides()
- result = apply_overrides(default_values, studio_values)
+
+ # TODO uncomment and remove hotfix result when overrides of anatomy
+ # are stored correctly.
+ # result = apply_overrides(default_values, studio_values)
+ result = copy.deepcopy(default_values)
+ if studio_values:
+ for key, value in studio_values.items():
+ result[key] = value
  if clear_metadata:
  clear_metadata_from_settings(result)
  return result
@@ -352,7 +359,13 @@ def get_anatomy_settings(project_name, clear_metadata=True):
  project_name
  )
 
- result = apply_overrides(studio_overrides, project_overrides)
+ # TODO uncomment and remove hotfix result when overrides of anatomy
+ # are stored correctly.
+ # result = apply_overrides(studio_overrides, project_overrides)
+ result = copy.deepcopy(studio_overrides)
+ if project_overrides:
+ for key, value in project_overrides.items():
+ result[key] = value
  if clear_metadata:
  clear_metadata_from_settings(result)
  return result