FIX ListContents no longer called recursively (#415)

* ListContents no longer called recursively * Update FileIDHelpers to support the lookForVariantRecursive method Co-authored-by: Maxime Rainville <maxime@silverstripe.com>
silverstripe · Aug 10, 2020 · 4c509c1 · 4c509c1
1 parent f700ed6
commit 4c509c1
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 1 deletion.
diff --git a/src/FilenameParsing/FileIDHelper.php b/src/FilenameParsing/FileIDHelper.php
@@ -53,4 +53,11 @@ public function isVariantOf($fileID, ParsedFileID $parsedFileID);
      * @return string
      */
     public function lookForVariantIn(ParsedFileID $parsedFileID);
+
+    /**
+     * Specify if this File ID Helper stores variants in subfolders and require a recursive look up to find all
+     * variants.
+     * @return bool
+     */
+    public function lookForVariantRecursive(): bool;
 }
diff --git a/src/FilenameParsing/FileIDHelperResolutionStrategy.php b/src/FilenameParsing/FileIDHelperResolutionStrategy.php
@@ -436,7 +436,7 @@ public function findVariants($tuple, Filesystem $filesystem)
 
             // Find the correct folder to search for possible variants in
             $folder = $helper->lookForVariantIn($parsedFileID);
-            $possibleVariants = $filesystem->listContents($folder, true);
+            $possibleVariants = $filesystem->listContents($folder, $helper->lookForVariantRecursive());
 
             // Flysystem returns array of meta data abouch each file, we remove directories and map it down to the path
             $possibleVariants = array_filter($possibleVariants, function ($possibleVariant) {

diff --git a/src/FilenameParsing/HashFileIDHelper.php b/src/FilenameParsing/HashFileIDHelper.php
@@ -126,4 +126,9 @@ private function truncate($hash)
     {
         return substr($hash, 0, self::HASH_TRUNCATE_LENGTH);
     }
+
+    public function lookForVariantRecursive(): bool
+    {
+        return false;
+    }
 }
diff --git a/src/FilenameParsing/LegacyFileIDHelper.php b/src/FilenameParsing/LegacyFileIDHelper.php
@@ -238,4 +238,9 @@ public function lookForVariantIn(ParsedFileID $parsedFileID)
         }
         return $folder . '_resampled';
     }
+
+    public function lookForVariantRecursive(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/FilenameParsing/NaturalFileIDHelper.php b/src/FilenameParsing/NaturalFileIDHelper.php
@@ -99,4 +99,9 @@ public function lookForVariantIn(ParsedFileID $parsedFileID)
         $folder = dirname($parsedFileID->getFilename());
         return $folder == '.' ? '' : $folder;
     }
+
+    public function lookForVariantRecursive(): bool
+    {
+        return false;
+    }
 }
diff --git a/tests/php/FilenameParsing/MockFileIDHelper.php b/tests/php/FilenameParsing/MockFileIDHelper.php
@@ -57,4 +57,9 @@ public function lookForVariantIn(ParsedFileID $parsedFileID)
     {
         return $this->lookForVariantInVal;
     }
+
+    public function lookForVariantRecursive(): bool
+    {
+        return true;
+    }
 }