Fix file and directory sort functions to one function

Author: bluehaha2

src/controllers/ItemsController.php

@@ -18,11 +18,14 @@ public function getItems()
         $path = $this->getCurrentPath();
         $sort_type = request('sort_type');
 
+        $files = $this->sortFilesAndDirectories($this->getFilesWithInfo($path), $sort_type);
+        $directories = $this->sortFilesAndDirectories($this->getDirectories($path), $sort_type);
+
         return [
             'html' => (string)view($this->getView())->with([
-                'files'       => $this->getFilesWithInfo($path, $sort_type),
-                'directories' => $this->getDirectories($path, $sort_type),
-                'items'       => array_merge($this->getDirectories($path), $this->getFilesWithInfo($path))
+                'files'       => $files,
+                'directories' => $directories,
+                'items'       => array_merge($directories, $files)
             ]),
             'working_dir' => $this->getInternalPath($path)
         ];

src/traits/LfmHelpers.php

@@ -236,7 +236,7 @@ public function enabledShareFolder()
      ***     File System      ***
      ****************************/
 
-    public function getDirectories($path, $sort_type = 'alpha')
+    public function getDirectories($path)
     {
         $thumb_folder_name = config('lfm.thumb_folder_name');
         $all_directories = File::directories($path);
@@ -260,16 +260,10 @@ public function getDirectories($path, $sort_type = 'alpha')
             }
         }
 
-        if ($sort_type == 'alpha') {
-            uasort($arr_dir, array($this, 'compareDirAlpha'));
-        } elseif ($sort_type == 'time') {
-            uasort($arr_dir, array($this, 'compareDirTime'));
-        }
-
         return $arr_dir;
     }
 
-    public function getFilesWithInfo($path, $sort_type = 'alpha')
+    public function getFilesWithInfo($path)
     {
         $arr_files = [];
 
@@ -306,12 +300,6 @@ public function getFilesWithInfo($path, $sort_type = 'alpha')
             ];
         }
 
-        if ($sort_type == 'alpha') {
-            uasort($arr_files, array($this, 'compareFileAlpha'));
-        } elseif ($sort_type == 'time') {
-            uasort($arr_files, array($this, 'compareFileTime'));
-        }
-
         return $arr_files;
     }
 
@@ -338,44 +326,27 @@ public function fileIsImage($file)
         return starts_with($mime_type, 'image');
     }
 
-    private static function compareDirAlpha($a, $b)
-    {
-        $cmp = strcmp($a->name, $b->name);
-
-        if ($cmp == 0) {
-            return 0;
-        }
-
-        return ($cmp > 0) ? 1 : -1;
-    }
-
-    private static function compareDirTime($a, $b)
+    public function sortFilesAndDirectories($arr_items, $sort_type)
     {
-        if ($a->updated == $b->updated) {
-            return 0;
+        if ($sort_type == 'time') {
+            $key_to_sort = 'updated';
+        } elseif ($sort_type == 'alpha') {
+            $key_to_sort = 'name';
+        } else {
+            $key_to_sort = 'updated';
         }
 
-        return ($a->updated > $b->updated) ? 1 : -1;
-    }
-
-    private static function compareFileAlpha($a, $b)
-    {
-        $cmp = strcmp($a['name'], $b['name']);
-
-        if ($cmp == 0) {
-            return 0;
-        }
+        uasort($arr_items, function ($a, $b) use ($key_to_sort) {
+            $cmp = strcmp($a->{$key_to_sort}, $b->{$key_to_sort});
 
-        return ($cmp > 0) ? 1 : -1;
-    }
+            if ($cmp == 0) {
+                return 0;
+            }
 
-    private static function compareFileTime($a, $b)
-    {
-        if ($a['updated'] == $b['updated']) {
-            return 0;
-        }
+            return ($cmp > 0) ? 1 : -1;
+        });
 
-        return ($a['updated'] > $b['updated']) ? 1 : -1;
+        return $arr_items;
     }
 
 

src/views/grid-view.blade.php

@@ -19,7 +19,7 @@
         <img src="{{ $thumb_src }}">
         @else
         <div class="icon-container">
-          <i class="fa {{ $file->icon }} fa-5x"></i>
+          <i class="fa {{ $item->icon }} fa-5x"></i>
         </div>
         @endif
       </div>