remove redundant code

Author: streamtw

public/js/script.js

@@ -247,22 +247,21 @@ function goTo(new_dir) {
 }
 
 function getPreviousDir() {
-  var ds = '/';
   var working_dir = $('#working_dir').val();
-  return working_dir.substring(0, working_dir.lastIndexOf(ds));
+  return working_dir.substring(0, working_dir.lastIndexOf('/'));
 }
 
 function setOpenFolders() {
-  $('[data-type=0]').each(function (index, folder) {
+  $('#tree [data-path]').each(function (index, folder) {
     // close folders that are not parent
     var should_open = ($('#working_dir').val() + '/').startsWith($(folder).data('path') + '/');
     $(folder).children('i')
       .toggleClass('fa-folder-open', should_open)
       .toggleClass('fa-folder', !should_open);
   });
 
-  $('.nav-pills').find('li').removeClass('active');
-  $('[data-path="' + $('#working_dir').val() + '"]').parent('.nav-item').addClass('active');
+  $('#tree .nav-item').removeClass('active');
+  $('#tree [data-path="' + $('#working_dir').val() + '"]').parent('.nav-item').addClass('active');
 }
 
 // ====================
@@ -334,7 +333,7 @@ function loadItems() {
       selected = [];
       var response = JSON.parse(data);
       items = response.items;
-      var hasItems = response.items.length !== 0;
+      var hasItems = items.length !== 0;
       $('#empty').toggleClass('d-none', hasItems);
       $('#content').html('').removeAttr('class');
 

src/Lfm.php

@@ -33,16 +33,6 @@ public function input($key)
         return $this->translateFromUtf8($this->request->input($key));
     }
 
-    /**
-     * Check current lfm type is image or not.
-     *
-     * @return bool
-     */
-    public function isProcessingImages()
-    {
-        return lcfirst(str_singular($this->input('type'))) === 'image';
-    }
-
     /**
      * Get only the file name.
      *
@@ -77,12 +67,16 @@ public function getCategoryName()
      */
     public function currentLfmType()
     {
-        $file_type = 'file';
-        if ($this->isProcessingImages()) {
-            $file_type = 'image';
+        $lfm_type = 'file';
+
+        $request_type = lcfirst(str_singular($this->input('type')));
+        $available_types = array_keys($this->config->get('lfm.folder_categories'));
+
+        if (in_array($request_type, $available_types)) {
+            $lfm_type = $request_type;
         }
 
-        return $file_type;
+        return $lfm_type;
     }
 
     public function getDisplayMode()

src/LfmFileRepository.php

@@ -25,36 +25,6 @@ public function rootPath()
         return public_path() . '/';
     }
 
-    public function directories()
-    {
-        return File::directories($this->path);
-    }
-
-    public function files()
-    {
-        return File::files($this->path);
-    }
-
-    public function makeDirectory()
-    {
-        return File::makeDirectory($this->path, 0777, true, true);
-    }
-
-    public function exists()
-    {
-        return File::exists($this->path);
-    }
-
-    public function getFile()
-    {
-        return File::get($this->path);
-    }
-
-    public function mimeType()
-    {
-        return File::mimeType($this->path);
-    }
-
     public function isDirectory()
     {
         $parent_path = substr($this->path, 0, strrpos($this->path, '/'));
@@ -69,17 +39,6 @@ public function move($new_lfm_path)
         return File::move($this->path, $new_lfm_path->path('storage'));
     }
 
-    /**
-     * Check a folder and its subfolders is empty or not.
-     *
-     * @param  string  $directory_path  Real path of a directory.
-     * @return bool
-     */
-    public function directoryIsEmpty()
-    {
-        return count(File::allFiles($this->path)) == 0;
-    }
-
     public function save($file, $new_filename)
     {
         File::move($file->getRealPath(), $this->path . '/' . $new_filename);

src/LfmItem.php

@@ -9,6 +9,7 @@ class LfmItem
     private $lfm_path;
     private $lfm;
 
+    private $columns = ['name', 'path', 'time', 'icon', 'is_file', 'is_image', 'thumb_url'];
     public $attributes = [];
 
     public function __construct(LfmPath $lfm_path, Lfm $lfm)
@@ -29,7 +30,7 @@ public function __get($var_name)
 
     public function fill()
     {
-        foreach (['name', 'path', 'time', 'icon', 'is_file', 'is_image', 'thumb_url'] as $column) {
+        foreach ($this->columns as $column) {
             $this->__get($column);
         }
 
@@ -85,9 +86,7 @@ public function mimeType()
 
     public function extension()
     {
-        return pathinfo($this->absolutePath(), PATHINFO_EXTENSION);
-        // return \File::extension($old_file->path('absolute'));
-        // return $this->storage->disk->extension($this->absolutePath());
+        return $this->lfm_path->extension();
     }
 
     public function path()
@@ -107,7 +106,6 @@ public function size()
     public function time()
     {
         return $this->lfm_path->lastModified();
-        // return filemtime($this->absolutePath());
     }
 
     public function thumbUrl()

src/LfmPath.php

@@ -103,7 +103,7 @@ public function appendPathToFile($path, $is_windows = false)
     public function folders()
     {
         $all_folders = array_map(function ($directory_path) {
-            return $this->get($directory_path);
+            return $this->pretty($directory_path);
         }, $this->storage->directories($this));
 
         $folders = array_filter($all_folders, function ($directory) {
@@ -116,13 +116,13 @@ public function folders()
     public function files()
     {
         $files = array_map(function ($file_path) {
-            return $this->get($file_path);
+            return $this->pretty($file_path);
         }, $this->storage->files());
 
         return $this->sortByColumn($files);
     }
 
-    public function get($item_path)
+    public function pretty($item_path)
     {
         $lfm_path = clone $this;
         $lfm_path = $lfm_path->setName($this->helper->getNameFromPath($item_path));
@@ -151,7 +151,18 @@ public function createFolder()
             return false;
         }
 
-        return $this->storage->makeDirectory($this);
+        return $this->storage->makeDirectory(0777, true, true);
+    }
+
+    /**
+     * Check a folder and its subfolders is empty or not.
+     *
+     * @param  string  $directory_path  Real path of a directory.
+     * @return bool
+     */
+    public function directoryIsEmpty()
+    {
+        return count($this->disk->allFiles()) == 0;
     }
 
     public function normalizeWorkingDir()
@@ -165,7 +176,6 @@ public function normalizeWorkingDir()
      * Sort files and directories.
      *
      * @param  mixed  $arr_items  Array of files or folders or both.
-     * @param  mixed  $sort_type  Alphabetic or time.
      * @return array of object
      */
     public function sortByColumn($arr_items)

src/LfmStorageRepository.php

@@ -3,20 +3,16 @@
 namespace UniSharp\LaravelFilemanager;
 
 use Illuminate\Support\Facades\Storage;
-use Unisharp\FileApi\FileApi;
 
 class LfmStorageRepository implements RepositoryContract
 {
-    private $disk_name;
-
     private $disk;
 
     private $path;
 
     public function __construct($storage_path, $disk_name)
     {
-        $this->disk_name = $disk_name;
-        $this->disk = Storage::disk($this->disk_name);
+        $this->disk = Storage::disk($disk_name);
         $this->path = $storage_path;
     }
 
@@ -32,36 +28,6 @@ public function rootPath()
         return $this->disk->getDriver()->getAdapter()->getPathPrefix();
     }
 
-    public function directories()
-    {
-        return $this->disk->directories($this->path);
-    }
-
-    public function files()
-    {
-        return $this->disk->files($this->path);
-    }
-
-    public function makeDirectory()
-    {
-        return $this->disk->makeDirectory($this->path, 0777, true, true);
-    }
-
-    public function exists()
-    {
-        return $this->disk->exists($this->path);
-    }
-
-    public function getFile()
-    {
-        return $this->disk->get($this->path);
-    }
-
-    public function mimeType()
-    {
-        return $this->disk->mimeType($this->path);
-    }
-
     public function isDirectory()
     {
         $parent_path = substr($this->path, 0, strrpos($this->path, '/'));
@@ -76,24 +42,8 @@ public function move($new_lfm_path)
         return $this->disk->move($this->path, $new_lfm_path->path('storage'));
     }
 
-    /**
-     * Check a folder and its subfolders is empty or not.
-     *
-     * @param  string  $directory_path  Real path of a directory.
-     * @return bool
-     */
-    public function directoryIsEmpty()
-    {
-        return count($this->disk->allFiles($this->path)) == 0;
-    }
-
     public function save($file, $new_filename)
     {
         $this->disk->putFileAs($this->path, $file, $new_filename);
     }
-
-    private function insertSuffix($suffix, $file_name)
-    {
-        return substr_replace($file_name, $suffix, strpos($file_name, '.'), 0);
-    }
 }

src/RepositoryContract.php

@@ -6,27 +6,7 @@ interface RepositoryContract
 {
     public function rootPath();
 
-    public function directories();
-
-    public function files();
-
-    public function makeDirectory();
-
-    public function exists();
-
-    public function getFile();
-
-    public function mimeType();
-
-    public function isDirectory();
-
     public function move($new_lfm_path);
 
-    /**
-     * Check a folder and its subfolders is empty or not.
-     *
-     * @param  string  $directory_path  Real path of a directory.
-     * @return bool
-     */
-    public function directoryIsEmpty();
+    public function save($file, $new_filename);
 }