From f30f0099fd65416ffcf4d282d6accbd4e885e9c9 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Thu, 14 May 2020 10:59:40 +0200
Subject: [PATCH] for padding is used frame_padding from anatomy templates but
 kept backwards compatible "frame"

---
 pype/nuke/lib.py                                        | 9 ++++++++-
 pype/plugins/global/publish/integrate_master_version.py | 7 +++++--
 pype/plugins/global/publish/integrate_new.py            | 7 +++++--
 pype/plugins/nukestudio/publish/collect_plates.py       | 7 ++++++-
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pype/nuke/lib.py b/pype/nuke/lib.py
index bd39666ab9..a706753755 100644
--- a/pype/nuke/lib.py
+++ b/pype/nuke/lib.py
@@ -177,9 +177,16 @@ def format_anatomy(data):
     log.debug("__ anatomy.templates: {}".format(anatomy.templates))
 
     try:
-        padding = int(anatomy.templates['render']['padding'])
+        # TODO: bck compatibility with old anatomy template
+        padding = int(
+            anatomy.templates["render"].get(
+                "frame_padding",
+                anatomy.templates["render"].get("padding")
+            )
+        )
     except KeyError as e:
         msg = ("`padding` key is not in `render` "
+               "or `frame_padding` on is not available in "
                "Anatomy template. Please, add it there and restart "
                "the pipeline (padding: \"4\"): `{}`").format(e)
 
diff --git a/pype/plugins/global/publish/integrate_master_version.py b/pype/plugins/global/publish/integrate_master_version.py
index e6e4247dd8..d82c3be075 100644
--- a/pype/plugins/global/publish/integrate_master_version.py
+++ b/pype/plugins/global/publish/integrate_master_version.py
@@ -356,8 +356,11 @@ class IntegrateMasterVersion(pyblish.api.InstancePlugin):
                 _anatomy_filled = anatomy.format(anatomy_data)
                 _template_filled = _anatomy_filled["master"]["path"]
                 head, tail = _template_filled.split(frame_splitter)
-                padding = (
-                    anatomy.templates["render"]["padding"]
+                padding = int(
+                    anatomy.templates["render"].get(
+                        "frame_padding",
+                        anatomy.templates["render"].get("padding")
+                    )
                 )
 
                 dst_col = clique.Collection(
diff --git a/pype/plugins/global/publish/integrate_new.py b/pype/plugins/global/publish/integrate_new.py
index fc785f6065..08c390d040 100644
--- a/pype/plugins/global/publish/integrate_new.py
+++ b/pype/plugins/global/publish/integrate_new.py
@@ -341,8 +341,11 @@ class IntegrateAssetNew(pyblish.api.InstancePlugin):
                 index_frame_start = None
 
                 if repre.get("frameStart"):
-                    frame_start_padding = (
-                        anatomy.templates["render"]["padding"]
+                    frame_start_padding = int(
+                        anatomy.templates["render"].get(
+                            "frame_padding",
+                            anatomy.templates["render"].get("padding")
+                        )
                     )
                     index_frame_start = int(repre.get("frameStart"))
 
diff --git a/pype/plugins/nukestudio/publish/collect_plates.py b/pype/plugins/nukestudio/publish/collect_plates.py
index 8a79354bbf..3e5ba51b60 100644
--- a/pype/plugins/nukestudio/publish/collect_plates.py
+++ b/pype/plugins/nukestudio/publish/collect_plates.py
@@ -104,7 +104,12 @@ class CollectPlatesData(api.InstancePlugin):
         version_data = dict()
         context = instance.context
         anatomy = context.data.get("anatomy", None)
-        padding = int(anatomy.templates['render']['padding'])
+        padding = int(
+            anatomy.templates["render"].get(
+                "frame_padding",
+                anatomy.templates["render"].get("padding")
+            )
+        )
 
         name = instance.data["subset"]
         source_path = instance.data["sourcePath"]