Added config for Maya publisher rewrite

Added config for Maya publisher rewrite

core/templates/common.yml

@@ -43,6 +43,13 @@ keys:
   name:
     type: str
     filter_by: alphanumeric
+  publish_extension:
+    type: str
+  publish_name:
+    type: str
+    filter_by: alphanumeric
+  publish_type:
+    type: str
   iteration:
     type: int
   version:

core/templates/tk-maya.yml

@@ -56,7 +56,9 @@ paths:
   # Alembic
   maya_shot_abc:
     definition: "@shot_publish/abc/{name}/v{version}/{Projectcode}_{Shot}_{Step}_{name}_v{version}.abc"
-
+  # Named publishes 
+  maya_shot_named_publish:
+    definition: "@shot_publish/{publish_type}/{name}/{publish_name}/v{version}/{Projectcode}_{Shot}_{Step}_{name}_{publish_name}_{publish_type}_v{version}.{publish_extension}"
   ##########################################################################################
   # Asset pipeline
   #
@@ -78,4 +80,7 @@ paths:
     definition: "@asset_publish/maya/{Projectcode}_{Asset}_{Step}_{name}_pub_v{version}.{maya_extension}"
   # Alembic
   maya_asset_abc:
-    definition: "@asset_publish/abc/{Projectcode}_{Asset}_{Step}_{name}_v{version}.abc"
+    definition: "@asset_publish/abc/{Projectcode}_{Asset}_{Step}_{name}_v{version}.abc"
+  # Named publishes 
+  maya_asset_named_publish:
+    definition: "@asset_publish/{publish_type}/{name}/{publish_name}/v{version}/{Projectcode}_{Asset}_{Step}_{name}_{publish_name}_{publish_type}_v{version}.{publish_extension}"

env/includes/engine_locations.yml

@@ -73,7 +73,7 @@ engines.tk-maya.location:
   type: github_release
   organization: nfa-vfxim
   repository: tk-maya
-  version: 0.11.1.8
+  version: 0.12.0.0
 
 # Motion Builder
 engines.tk-motionbuilder.location:

env/includes/settings/tk-multi-publish2.yml

@@ -173,7 +173,7 @@ settings.tk-multi-publish2.mari.asset_step:
 
 # asset step
 settings.tk-multi-publish2.maya.asset_step:
-  collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
+  collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/publishers/collector.py"
   collector_settings:
     Work Template: maya_asset_work
   publish_plugins:
@@ -183,31 +183,29 @@ settings.tk-multi-publish2.maya.asset_step:
     - name: Upload for review
       hook: "{self}/upload_version.py"
       settings: {}
-    - name: Begin file versioning
-      hook: "{engine}/tk-multi-publish2/basic/start_version_control.py"
-      settings: {}
-    - name: Publish to ShotGrid
-      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
+    - name: Publish Maya file to ShotGrid
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_session.py"
       settings:
         Publish Template: maya_asset_publish
-    - name: Publish USD to ShotGrid
-      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session_usd.py"
+    - name: ShotGrid animation exporter
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_animation.py"
       settings:
-        Publish Template: usd_asset_publish
-        Export Active Selection Only: False
-        Disable Animations Export: False
-        Export Current Frame Only: False
-    - name: Publish to ShotGrid
-      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session_alembic.py"
+        Publish Template: maya_asset_named_publish
+    - name: ShotGrid camera exporter
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_camera.py"
       settings:
-        Publish Template: maya_asset_abc
-        Export Active Selection Only: False
+        Publish Template: maya_asset_named_publish
+    - name: ShotGrid model exporter
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_model.py"
+      settings:
+        Publish Template: maya_asset_named_publish
+
   help_url: *help_url
   location: "@apps.tk-multi-publish2.location"
 
 # shot step
 settings.tk-multi-publish2.maya.shot_step:
-  collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/collector.py"
+  collector: "{self}/collector.py:{engine}/tk-multi-publish2/basic/publishers/collector.py"
   collector_settings:
     Work Template: maya_shot_work
   publish_plugins:
@@ -217,25 +215,22 @@ settings.tk-multi-publish2.maya.shot_step:
     - name: Upload for review
       hook: "{self}/upload_version.py"
       settings: {}
-    - name: Begin file versioning
-      hook: "{engine}/tk-multi-publish2/basic/start_version_control.py"
-      settings: {}
-    - name: Publish to ShotGrid
-      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session.py"
+    - name: Publish Maya file to ShotGrid
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_session.py"
       settings:
         Publish Template: maya_shot_publish
-    - name: Publish USD to ShotGrid
-      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session_usd.py"
+    - name: ShotGrid animation exporter
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_animation.py"
       settings:
-        Publish Template: usd_shot_publish
-        Export Active Selection Only: False
-        Disable Animations Export: False
-        Export Current Frame Only: False
-    - name: Publish to ShotGrid
-      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publish_session_alembic.py"
+        Publish Template: maya_shot_named_publish
+    - name: ShotGrid camera exporter
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_camera.py"
+      settings:
+        Publish Template: maya_shot_named_publish
+    - name: ShotGrid model exporter
+      hook: "{self}/publish_file.py:{engine}/tk-multi-publish2/basic/publishers/publish_model.py"
       settings:
-        Publish Template: maya_shot_abc
-        Export Active Selection Only: False
+        Publish Template: maya_shot_named_publish
 
   help_url: *help_url
   location: "@apps.tk-multi-publish2.location"