Update directory and file sort by time or alphabets

Author: bluehaha2

public/js/script.js

@@ -1,4 +1,5 @@
 var show_list;
+var sort_type = 0;
 
 $(document).ready(function () {
   bootbox.setDefaults({locale:lang['locale-bootbox']});
@@ -74,6 +75,16 @@ $('#list-display').click(function () {
   loadItems();
 });
 
+$('#list-sort-alpha').click(function() {
+  sort_type = 0;
+  loadItems();
+});
+
+$('#list-sort-time').click(function() {
+  sort_type = 1;
+  loadItems();
+});
+
 // ======================
 // ==  Folder actions  ==
 // ======================
@@ -150,7 +161,7 @@ function loadFolders() {
 }
 
 function loadItems() {
-  performLfmRequest('jsonitems', {show_list: show_list}, 'html')
+  performLfmRequest('jsonitems', {show_list: show_list, sort_type: sort_type}, 'html')
     .done(function (data) {
       var response = JSON.parse(data);
       $('#content').html(response.html);

src/controllers/ItemsController.php

@@ -16,11 +16,12 @@ class ItemsController extends LfmController
     public function getItems()
     {
         $path = $this->getCurrentPath();
+        $sort_type = request('sort_type');
 
         return [
             'html' => (string)view($this->getView())->with([
-                'files'       => $this->getFilesWithInfo($path),
-                'directories' => $this->getDirectories($path)
+                'files'       => $this->getFilesWithInfo($path, $sort_type),
+                'directories' => $this->getDirectories($path, $sort_type)
             ]),
             'working_dir' => $this->getInternalPath($path)
         ];

src/lang/en/lfm.php

@@ -6,6 +6,9 @@
     'nav-upload'        => 'Upload',
     'nav-thumbnails'    => 'Thumbnails',
     'nav-list'          => 'List',
+    'nav-sort'          => 'Sort',
+    'nav-sort-alpha'    => 'Sort By Alphabets',
+    'nav-sort-time'     => 'Sort By Time',
 
     'menu-rename'       => 'Rename',
     'menu-delete'       => 'Delete',

src/lang/zh-TW/lfm.php

@@ -6,6 +6,9 @@
     'nav-upload'        => '上傳檔案',
     'nav-thumbnails'    => '縮圖顯示',
     'nav-list'          => '列表顯示',
+    'nav-sort'          => '排序',
+    'nav-sort-alpha'    => '依字母排序',
+    'nav-sort-time'     => '依時間排序',
 
     'menu-rename'       => '重新命名',
     'menu-delete'       => '刪除',

src/traits/LfmHelpers.php

@@ -236,7 +236,7 @@ public function enabledShareFolder()
      ***     File System      ***
      ****************************/
 
-    public function getDirectories($path)
+    public function getDirectories($path, $sort_type = 0)
     {
         $thumb_folder_name = config('lfm.thumb_folder_name');
         $all_directories = File::directories($path);
@@ -249,15 +249,22 @@ public function getDirectories($path)
             if ($directory_name !== $thumb_folder_name) {
                 $arr_dir[] = (object)[
                     'name' => $directory_name,
+                    'updated' => filemtime($directory),
                     'path' => $this->getInternalPath($directory)
                 ];
             }
         }
 
+        if ($sort_type == 0) {
+            uasort($arr_dir, array($this, 'cmpDirAlpha'));
+        } elseif ($sort_type == 1) {
+            uasort($arr_dir, array($this, 'cmpDirTime'));
+        }
+
         return $arr_dir;
     }
 
-    public function getFilesWithInfo($path)
+    public function getFilesWithInfo($path, $sort_type = 0)
     {
         $arr_files = [];
 
@@ -292,6 +299,12 @@ public function getFilesWithInfo($path)
             ];
         }
 
+        if ($sort_type == 0) {
+            uasort($arr_files, array($this, 'cmpAlpha'));
+        } elseif ($sort_type == 1) {
+            uasort($arr_files, array($this, 'cmpTime'));
+        }
+
         return $arr_files;
     }
 
@@ -318,6 +331,42 @@ public function fileIsImage($file)
         return starts_with($mime_type, 'image');
     }
 
+    private static function cmpDirAlpha($a, $b)
+    {
+        $cmp = strcmp($a->name, $b->name);
+
+        if ($cmp == 0)
+            return 0;
+
+        return ($cmp > 0) ? 1 : -1;
+    }
+
+    private static function cmpDirTime($a, $b)
+    {
+        if ($a->updated == $b->updated)
+            return 0;
+
+        return ($a->updated > $b->updated) ? 1 : -1;
+    }
+
+    private static function cmpAlpha($a, $b)
+    {
+        $cmp = strcmp($a['name'], $b['name']);
+
+        if ($cmp == 0)
+            return 0;
+
+        return ($cmp > 0) ? 1 : -1;
+    }
+
+    private static function cmpTime($a, $b)
+    {
+        if ($a['updated'] == $b['updated'])
+            return 0;
+
+        return ($a['updated'] > $b['updated']) ? 1 : -1;
+    }
+
 
     /****************************
      ***    Miscellaneouses   ***

src/views/index.blade.php

@@ -62,6 +62,23 @@
                       <i class="fa fa-list"></i> {{ trans('laravel-filemanager::lfm.nav-list') }}
                     </a>
                   </li>
+                  <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                      {{ trans('laravel-filemanager::lfm.nav-sort') }} <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li>
+                        <a href="#" id="list-sort-alpha">
+                          <i class="fa fa-sort-alpha-asc"></i> {{ trans('laravel-filemanager::lfm.nav-sort-alpha') }}
+                        </a>
+                      </li>
+                      <li>
+                        <a href="#" id="list-sort-time">
+                          <i class="fa fa-sort-amount-asc"></i> {{ trans('laravel-filemanager::lfm.nav-sort-time') }}
+                        </a>
+                      </li>
+                    </ul>
+                  </li>
                 </ul>
               </div>
             </nav>