create and apply path handling helpers to LfmHelper

Author: streamtw

src/traits/LfmHelpers.php

@@ -10,6 +10,8 @@ trait LfmHelpers
      ***       Path / Url      ***
      *****************************/
 
+    private $ds = '/';
+
     public function getThumbPath($image_name = null)
     {
         return $this->getCurrentPath($image_name, 'thumb');
@@ -19,9 +21,7 @@ public function getCurrentPath($file_name = null, $is_thumb = null)
     {
         $path = $this->composeSegments('dir', $is_thumb, $file_name);
 
-        if ($this->isRunningOnWindows()) {
-            $path = str_replace('/', '\\', $path);
-        }
+        $path = $this->translateToOsPath($path);
 
         return base_path($path);
     }
@@ -33,38 +33,36 @@ public function getThumbUrl($image_name = null)
 
     public function getFileUrl($image_name = null, $is_thumb = null)
     {
-        $url = $this->composeSegments('url', $is_thumb, $image_name);
-
-        return $url;
+        return $this->composeSegments('url', $is_thumb, $image_name);
     }
 
     private function composeSegments($type, $is_thumb, $file_name)
     {
-        $full_path = $this->getPathPrefix($type)
-            . $this->getFormatedWorkingDir()
-            . '/'
-            . $this->appendThumbFolderPath($is_thumb)
-            . $file_name;
-
-        $full_path = str_replace('\\', '/', $full_path);
+        $full_path = implode($this->ds, [
+            $this->getPathPrefix($type),
+            $this->getFormatedWorkingDir(),
+            $this->appendThumbFolderPath($is_thumb),
+            $file_name
+        ]);
 
-        if (ends_with($full_path, '/')) {
-            $full_path = substr($full_path, 0, -1);
-        }
+        $full_path = $this->removeDuplicateSlash($full_path);
+        $full_path = $this->translateToLfmPath($full_path);
 
-        return $full_path;
+        return $this->removeLastSlash($full_path);
     }
 
-    private function getFormatedWorkingDir()
+    public function getPathPrefix($type)
     {
-        $working_dir = request('working_dir');
-
-        // remove first slash
-        if (starts_with($working_dir, '/')) {
-            $working_dir = substr($working_dir, 1);
+        if (in_array($type, ['url', 'dir'])) {
+            return config('lfm.' . $this->currentLfmType() . 's_' . $type);
+        } else {
+            return null;
         }
+    }
 
-        return $working_dir;
+    private function getFormatedWorkingDir()
+    {
+        return $this->removeFirstSlash(request('working_dir'));
     }
 
     private function appendThumbFolderPath($is_thumb)
@@ -79,28 +77,86 @@ private function appendThumbFolderPath($is_thumb)
         $in_thumb_folder = preg_match('/'.$thumb_folder_name.'$/i', $this->getFormatedWorkingDir());
 
         if (!$in_thumb_folder) {
-            return $thumb_folder_name . '/';
+            return $thumb_folder_name . $this->ds;
         }
     }
 
     public function rootFolder($type)
     {
-        $folder_path = '/';
-
         if ($type === 'user') {
-            $folder_path .= $this->getUserSlug();
+            $folder_name = $this->getUserSlug();
         } else {
-            $folder_path .= config('lfm.shared_folder_name');
+            $folder_name = config('lfm.shared_folder_name');
         }
 
-        return $folder_path;
+        return $this->ds . $folder_name;
     }
 
     public function getRootFolderPath($type)
     {
         return base_path($this->getPathPrefix('dir') . $this->rootFolder($type));
     }
 
+    public function getName($file)
+    {
+        $lfm_file_path = $this->getInternalPath($file);
+
+        $arr_dir = explode($this->ds, $lfm_file_path);
+        $file_name = end($arr_dir);
+
+        return $file_name;
+    }
+
+    public function getInternalPath($file)
+    {
+        $file = $this->translateToLfmPath($file);
+        $lfm_dir_start = strpos($file, $this->getPathPrefix('dir'));
+        $working_dir_start = $lfm_dir_start + strlen($this->getPathPrefix('dir'));
+        $lfm_file_path = $this->ds . substr($file, $working_dir_start);
+
+        return $this->removeDuplicateSlash($lfm_file_path);
+    }
+
+    private function translateToOsPath($path)
+    {
+        if ($this->isRunningOnWindows()) {
+            $path = str_replace($this->ds, '\\', $path);
+        }
+        return $path;
+    }
+
+    private function translateToLfmPath($path)
+    {
+        if ($this->isRunningOnWindows()) {
+            $path = str_replace('\\', $this->ds, $path);
+        }
+        return $path;
+    }
+
+    private function removeDuplicateSlash($path)
+    {
+        return str_replace($this->ds . $this->ds, $this->ds, $path);
+    }
+
+    private function removeFirstSlash($path)
+    {
+        if (starts_with($path, $this->ds)) {
+            $path = substr($path, 1);
+        }
+
+        return $path;
+    }
+
+    private function removeLastSlash($path)
+    {
+        // remove last slash
+        if (ends_with($path, $this->ds)) {
+            $path = substr($path, 0, -1);
+        }
+
+        return $path;
+    }
+
 
     /****************************
      ***   Config / Settings  ***
@@ -132,15 +188,6 @@ public function allowMultiUser()
         return config('lfm.allow_multi_user') === true;
     }
 
-    public function getPathPrefix($type)
-    {
-        if (in_array($type, ['url', 'dir'])) {
-            return config('lfm.' . $this->currentLfmType() . 's_' . $type);
-        } else {
-            return null;
-        }
-    }
-
 
     /****************************
      ***     File System      ***
@@ -191,28 +238,6 @@ public function getUserSlug()
         return empty(auth()->user()) ? '' : auth()->user()->$slug_of_user;
     }
 
-    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);
-        }
-        $lfm_dir_start = strpos($file, $this->getPathPrefix('dir'));
-        $working_dir_start = $lfm_dir_start + strlen($this->getPathPrefix('dir'));
-        $lfm_file_path = substr($file, $working_dir_start);
-
-        return str_replace('//', '/', '/' . $lfm_file_path);
-    }
-
     public function error($error_type, $variables = [])
     {
         return trans('laravel-filemanager::lfm.error-' . $error_type, $variables);