From 353cccb54cd0d736d062689093226d89b60a679f Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Thu, 11 Jul 2019 17:03:34 +0200
Subject: [PATCH] (hotfix) mayaascii wasn't working with burnins and ftrack

---
 .../publish/integrate_ftrack_instances.py     |  2 +-
 .../plugins/maya/publish/collect_mayaascii.py | 25 +++++++++++++++++++
 .../plugins/maya/publish/extract_quicktime.py |  2 +-
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 pype/plugins/maya/publish/collect_mayaascii.py

diff --git a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
index a79e1f8ce5..9be0210c4c 100644
--- a/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
+++ b/pype/plugins/ftrack/publish/integrate_ftrack_instances.py
@@ -16,7 +16,7 @@ class IntegrateFtrackInstance(pyblish.api.InstancePlugin):
 
     family_mapping = {'camera': 'cam',
                       'look': 'look',
-                      'mayaAscii': 'scene',
+                      'mayaascii': 'scene',
                       'model': 'geo',
                       'rig': 'rig',
                       'setdress': 'setdress',
diff --git a/pype/plugins/maya/publish/collect_mayaascii.py b/pype/plugins/maya/publish/collect_mayaascii.py
new file mode 100644
index 0000000000..fbed8e0ead
--- /dev/null
+++ b/pype/plugins/maya/publish/collect_mayaascii.py
@@ -0,0 +1,25 @@
+from maya import cmds
+
+import pyblish.api
+
+
+class CollectMayaAscii(pyblish.api.InstancePlugin):
+    """Collect May Ascii Data
+
+    """
+
+    order = pyblish.api.CollectorOrder + 0.2
+    label = 'Collect Model Data'
+    families = ["mayaAscii"]
+
+    def process(self, instance):
+        # Extract only current frame (override)
+        frame = cmds.currentTime(query=True)
+        instance.data['startFrame'] = frame
+        instance.data['endFrame'] = frame
+
+        # make ftrack publishable
+        if instance.data.get('families'):
+            instance.data['families'].append('ftrack')
+        else:
+            instance.data['families'] = ['ftrack']
diff --git a/pype/plugins/maya/publish/extract_quicktime.py b/pype/plugins/maya/publish/extract_quicktime.py
index 5d5454ca16..ff08799c0a 100644
--- a/pype/plugins/maya/publish/extract_quicktime.py
+++ b/pype/plugins/maya/publish/extract_quicktime.py
@@ -137,7 +137,7 @@ class ExtractQuicktime(pype.api.Extractor):
                             "username": instance.context.data['user'],
                             "asset": os.environ['AVALON_ASSET'],
                             "task": os.environ['AVALON_TASK'],
-                            "start_frame": int(instance.data['startFrame']),
+                            "start_frame": int(start),
                             "version": "v" + str(version)
                             }
             }