Improved sorting of folder files.

omeka-s-modules · Sep 27, 2021 · 2c95691 · 2c95691
1 parent 92a47ba
commit 2c95691
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 38 deletions.
diff --git a/Module.php b/Module.php
@@ -202,6 +202,9 @@ protected function listFiles(string $directory, bool $recursive = false): array
 
         $listFiles = [];
 
+        // To simplify sort.
+        $listRootFiles = [];
+
         $lengthDir = strlen($this->directory) + 1;
         if ($recursive) {
             $dir = new \RecursiveDirectoryIterator($directory);
@@ -221,6 +224,9 @@ protected function listFiles(string $directory, bool $recursive = false): array
                     $relativePath = substr($filepath, $lengthDir);
                     // Use keys for quicker process on big directories.
                     $listFiles[$relativePath] = null;
+                    if (pathinfo($filepath, PATHINFO_DIRNAME) === $directory) {
+                        $listRootFiles[$relativePath] = null;
+                    }
                 }
             }
         } else {
@@ -237,25 +243,12 @@ protected function listFiles(string $directory, bool $recursive = false): array
             }
         }
 
-        // Don't mix directories and files, but list directories first as usual.
-        $alphabeticAndDirFirst = function ($a, $b) {
-            // Numeric array keys are number.
-            $a = (string) $a;
-            $b = (string) $b;
-            if ($a === $b) {
-                return 0;
-            }
-            $aInRoot = strpos($a, '/') === false;
-            $bInRoot = strpos($b, '/') === false;
-            if (($aInRoot && $bInRoot) || (!$aInRoot && !$bInRoot)) {
-                return strcasecmp($a, $b);
-            }
-            return $bInRoot ? -1 : 1;
-        };
-
-        uksort($listFiles, $alphabeticAndDirFirst);
-
-        return array_keys($listFiles);
+        // Don't mix directories and files. List root files, then sub-folders.
+        $listFiles = array_keys($listFiles);
+        natcasesort($listFiles);
+        $listRootFiles = array_keys($listRootFiles);
+        natcasesort($listRootFiles);
+        return array_values(array_unique(array_merge($listRootFiles, $listFiles)));
     }
 
     /**

diff --git a/src/Media/Ingester/SideloadDir.php b/src/Media/Ingester/SideloadDir.php
@@ -264,25 +264,9 @@ protected function listDirs(): void
             }
         }
 
-        // Don't mix directories and files, but list directories first as usual.
-        $alphabeticAndDirFirst = function ($a, $b) {
-            // Numeric array keys are number.
-            $a = (string) $a;
-            $b = (string) $b;
-            if ($a === $b) {
-                return 0;
-            }
-            $aInRoot = strpos($a, '/') === false;
-            $bInRoot = strpos($b, '/') === false;
-            if (($aInRoot && $bInRoot) || (!$aInRoot && !$bInRoot)) {
-                return strcasecmp($a, $b);
-            }
-            return $bInRoot ? -1 : 1;
-        };
-
-        uksort($this->listDirs, $alphabeticAndDirFirst);
-
-        $this->listDirs = array_combine(array_keys($this->listDirs), array_keys($this->listDirs));
+        $this->listDirs = array_keys($this->listDirs);
+        natcasesort($this->listDirs);
+        $this->listDirs = array_combine($this->listDirs, $this->listDirs);
     }
 
     /**