From 8a14e5d544ade37068cda522628eaff068b411a5 Mon Sep 17 00:00:00 2001
From: Milan Kolar <milan@pype.club>
Date: Wed, 11 Dec 2019 00:05:52 +0100
Subject: [PATCH] make sure we process texture when force copy and maketx is
 enabled

---
 pype/plugins/maya/publish/collect_look.py |  4 ----
 pype/plugins/maya/publish/extract_look.py | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pype/plugins/maya/publish/collect_look.py b/pype/plugins/maya/publish/collect_look.py
index 17f8180fdf..7a5fea776c 100644
--- a/pype/plugins/maya/publish/collect_look.py
+++ b/pype/plugins/maya/publish/collect_look.py
@@ -219,10 +219,6 @@ class CollectLook(pyblish.api.InstancePlugin):
         with lib.renderlayer(instance.data["renderlayer"]):
             self.collect(instance)
 
-        # make ftrack publishable
-        self.maketx = instance.data.get('maketx', True)
-        instance.data['maketx'] = self.maketx
-        self.log.info('maketx: {}'.format(self.maketx))
 
     def collect(self, instance):
 
diff --git a/pype/plugins/maya/publish/extract_look.py b/pype/plugins/maya/publish/extract_look.py
index ad43e02d21..5226f80f7a 100644
--- a/pype/plugins/maya/publish/extract_look.py
+++ b/pype/plugins/maya/publish/extract_look.py
@@ -74,6 +74,8 @@ def maketx(source, destination, *args):
     cmd.extend(args)
     cmd.extend(["-o", destination, source])
 
+    cmd = " ".join(cmd)
+
     CREATE_NO_WINDOW = 0x08000000
     kwargs = dict(args=cmd, stderr=subprocess.STDOUT)
 
@@ -183,6 +185,7 @@ class ExtractLook(pype.api.Extractor):
         transfers = list()
         hardlinks = list()
         hashes = dict()
+        forceCopy = instance.data.get("forceCopy", False)
 
         self.log.info(files)
         for filepath in files_metadata:
@@ -195,20 +198,26 @@ class ExtractLook(pype.api.Extractor):
                 files_metadata[filepath]["color_space"] = "raw"
 
             source, mode, hash = self._process_texture(
-                filepath, do_maketx, staging=dir_path, linearise=linearise
+                filepath,
+                do_maketx,
+                staging=dir_path,
+                linearise=linearise,
+                force=forceCopy
             )
             destination = self.resource_destination(instance,
                                                     source,
                                                     do_maketx)
 
             # Force copy is specified.
-            if instance.data.get("forceCopy", False):
+            if forceCopy:
                 mode = COPY
 
             if mode == COPY:
                 transfers.append((source, destination))
+                self.log.info('copying')
             elif mode == HARDLINK:
                 hardlinks.append((source, destination))
+                self.log.info('hardlinking')
 
             # Store the hashes from hash to destination to include in the
             # database
@@ -337,7 +346,7 @@ class ExtractLook(pype.api.Extractor):
             instance.data["assumedDestination"], "resources", basename + ext
         )
 
-    def _process_texture(self, filepath, do_maketx, staging, linearise):
+    def _process_texture(self, filepath, do_maketx, staging, linearise, force):
         """Process a single texture file on disk for publishing.
         This will:
             1. Check whether it's already published, if so it will do hardlink
@@ -359,7 +368,7 @@ class ExtractLook(pype.api.Extractor):
         # If source has been published before with the same settings,
         # then don't reprocess but hardlink from the original
         existing = find_paths_by_hash(texture_hash)
-        if existing:
+        if existing and not force:
             self.log.info("Found hash in database, preparing hardlink..")
             source = next((p for p in existing if os.path.exists(p)), None)
             if filepath: