refactor folder controller

Author: streamtw

src/controllers/FolderController.php

@@ -15,20 +15,30 @@ class FolderController extends LfmController
      */
     public function getFolders()
     {
-        $user_path     = parent::getRootFolderPath('user');
-        $lfm_user_path = parent::getFileName($user_path);
-        $user_folders  = parent::getDirectories($user_path);
+        $folder_types = [];
+        $root_folders = [];
 
-        $share_path     = parent::getRootFolderPath('share');
-        $lfm_share_path = parent::getFileName($share_path);
-        $shared_folders = parent::getDirectories($share_path);
+        if (parent::allowMultiUser()) {
+            $folder_types['user'] = 'root';
+        }
+
+        if (true) {
+            $folder_types['share'] = 'shares';
+        }
+
+        foreach ($folder_types as $folder_type => $lang_key) {
+            $root_folder_path = parent::getRootFolderPath($folder_type);
+
+            array_push($root_folders, (object)[
+                'name' => trans('laravel-filemanager::lfm.title-' . $lang_key),
+                'path' => parent::getInternalPath($root_folder_path),
+                'children' => parent::getDirectories($root_folder_path),
+                'has_next' => !($lang_key == end($folder_types))
+            ]);
+        }
 
         return view('laravel-filemanager::tree')
-            ->with('allow_multi_user', parent::allowMultiUser())
-            ->with('user_dir', $lfm_user_path['long'])
-            ->with('dirs', $user_folders)
-            ->with('share_dir', $lfm_share_path['long'])
-            ->with('shares', $shared_folders);
+            ->with(compact('root_folders'));
     }
 
 

src/traits/LfmHelpers.php

@@ -145,10 +145,13 @@ public function getDirectories($path)
         $arr_dir = [];
 
         foreach ($all_directories as $directory) {
-            $dir_name = $this->getFileName($directory);
+            $directory_name = $this->getName($directory);
 
-            if ($dir_name['short'] !== $thumb_folder_name) {
-                $arr_dir[] = $dir_name;
+            if ($directory_name !== $thumb_folder_name) {
+                $arr_dir[] = (object)[
+                    'name' => $directory_name,
+                    'path' => $this->getInternalPath($directory)
+                ];
             }
         }
 
@@ -174,7 +177,17 @@ public function getUserSlug()
         return empty(auth()->user()) ? '' : auth()->user()->$slug_of_user;
     }
 
-    public function getFileName($file)
+    public function getName($file)
+    {
+        $lfm_file_path = $this->getInternalPath($file);
+
+        $arr_dir = explode('/', $lfm_file_path);
+        $file_name = end($arr_dir);
+
+        return $file_name;
+    }
+
+    public function getInternalPath($file)
     {
         if ($this->isRunningOnWindows()) {
             $file = str_replace('\\', '/', $file);
@@ -183,11 +196,7 @@ public function getFileName($file)
         $working_dir_start = $lfm_dir_start + strlen($this->getPathPrefix('dir'));
         $lfm_file_path = substr($file, $working_dir_start);
 
-        $arr_dir = explode('/', $lfm_file_path);
-        $arr_filename['short'] = end($arr_dir);
-        $arr_filename['long'] = str_replace('//', '/', '/' . $lfm_file_path);
-
-        return $arr_filename;
+        return str_replace('//', '/', '/' . $lfm_file_path);
     }
 
     public function error($error_type, $variables = [])

src/views/folders.blade.php

@@ -1,5 +1,5 @@
-<?php $folder_name = $dir_name['short']; ?>
-<?php $folder_path = $dir_name['long']; ?>
+<?php $folder_name = $directory->name; ?>
+<?php $folder_path = $directory->path; ?>
 
 <div class="thumbnail clickable">
   <div data-id="{{ $folder_path }}" class="folder-item square">

src/views/grid-view.blade.php

@@ -2,7 +2,7 @@
 
   @if((sizeof($files) > 0) || (sizeof($directories) > 0))
 
-  @foreach($directories as $key => $dir_name)
+  @foreach($directories as $directory)
   <div class="col-sm-4 col-md-3 col-lg-2 img-row">
     @include('laravel-filemanager::folders')
   </div>

src/views/tree.blade.php

@@ -1,29 +1,19 @@
 <ul class="list-unstyled">
-  @if($allow_multi_user)
-  <li>
-    <a class="clickable folder-item" data-id="{{ $user_dir }}">
-      <i class="fa fa-folder-open"></i> {{ Lang::get('laravel-filemanager::lfm.title-root') }}
-    </a>
-  </li>
-  @foreach($dirs as $key => $dir_name)
-  <li style="margin-left: 10px;">
-    <a class="clickable folder-item" data-id="{{ $dir_name['long'] }}">
-      <i class="fa fa-folder"></i> {{ $dir_name['short'] }}
-    </a>
-  </li>
-  @endforeach
-  <hr>
-  @endif
-  <li>
-    <a class="clickable folder-item" data-id="{{ $share_dir }}">
-      <i class="fa fa-folder"></i> {{ Lang::get('laravel-filemanager::lfm.title-shares') }}
-    </a>
-  </li>
-  @foreach($shares as $key => $dir_name)
-  <li style="margin-left: 10px;">
-    <a class="clickable folder-item" data-id="{{ $dir_name['long'] }}">
-      <i class="fa fa-folder"></i> {{ $dir_name['short'] }}
-    </a>
-  </li>
+  @foreach($root_folders as $root_folder)
+    <li>
+      <a class="clickable folder-item" data-id="{{ $root_folder->path }}">
+        <i class="fa fa-folder"></i> {{ $root_folder->name }}
+      </a>
+    </li>
+    @foreach($root_folder->children as $directory)
+      <li style="margin-left: 10px;">
+        <a class="clickable folder-item" data-id="{{ $directory->path }}">
+          <i class="fa fa-folder"></i> {{ $directory->name }}
+        </a>
+      </li>
+    @endforeach
+    @if($root_folder->has_next)
+      <hr>
+    @endif
   @endforeach
 </ul>