Small refactoring

Author: youchenlee

src/controllers/FolderController.php

@@ -55,19 +55,21 @@ public function getFolders()
     public function getAddfolder()
     {
         $folder_name = parent::translateFromUtf8(trim(request('name')));
-
         $path = parent::getCurrentPath($folder_name);
 
         if (empty($folder_name)) {
             return parent::error('folder-name');
-        } elseif (File::exists($path)) {
+        }
+
+        if (File::exists($path)) {
             return parent::error('folder-exist');
-        } elseif (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $folder_name)) {
-            return parent::error('folder-alnum');
-        } else {
-            parent::createFolderByPath($path);
+        }
 
-            return parent::$success_response;
+        if (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $folder_name)) {
+            return parent::error('folder-alnum');
         }
+
+        parent::createFolderByPath($path);
+        return parent::$success_response;
     }
 }

src/controllers/ItemsController.php

@@ -32,20 +32,29 @@ public function getItems()
 
     private function getView()
     {
-        $view_type = 'grid';
-        $show_list = request('show_list');
-
-        if ($show_list === '1') {
-            $view_type = 'list';
-        } elseif (is_null($show_list)) {
-            $type_key = parent::currentLfmType();
-            $startup_view = config('lfm.' . $type_key . 's_startup_view');
-
-            if (in_array($startup_view, ['list', 'grid'])) {
-                $view_type = $startup_view;
-            }
+        $view_type = request('show_list');
+
+        if (null === $view_type) {
+            return $this->composeViewName($this->getStartupViewFromConfig());
         }
 
-        return 'laravel-filemanager::' . $view_type . '-view';
+        $view_mapping = [
+            '0' => 'grid',
+            '1' => 'list'
+        ];
+
+        return $this->composeViewName($view_mapping[$view_type]);
+    }
+
+    private function composeViewName($view_type = 'grid')
+    {
+        return "laravel-filemanager::$view_type-view";
+    }
+
+    private function getStartupViewFromConfig($default = 'grid')
+    {
+        $type_key = parent::currentLfmType();
+        $startup_view = config('lfm.' . $type_key . 's_startup_view', $default);
+        return $startup_view;
     }
 }

src/controllers/RedirectController.php

@@ -17,7 +17,6 @@ public function __construct()
     {
         $delimiter = config('lfm.url_prefix') . '/';
         $url = urldecode(request()->url());
-        // dd($delimiter);
         $external_path = substr($url, strpos($url, $delimiter) + strlen($delimiter));
 
         $this->file_path = base_path(config('lfm.base_directory', 'public') . '/' . $external_path);

src/controllers/ResizeController.php

@@ -27,6 +27,7 @@ public function getResize()
 
         $scaled = false;
 
+        // FIXME size should be configurable
         if ($original_width > 600) {
             $ratio = 600 / $original_width;
             $width = $original_width * $ratio;