fix integration on Windows

Author: streamtw

src/Lfm.php

@@ -22,9 +22,9 @@ public function __construct(Config $config = null, Request $request = null)
     public function getStorage($storage_path)
     {
         if ($this->config->get('lfm.driver') === 'storage') {
-            return new LfmStorageRepository($storage_path, $this->config->get('lfm.disk'));
+            return new LfmStorageRepository($storage_path, $this);
         } else {
-            return new LfmFileRepository($storage_path);
+            return new LfmFileRepository($storage_path, $this);
         }
     }
 

src/LfmFileRepository.php

@@ -7,10 +7,12 @@
 class LfmFileRepository implements RepositoryContract
 {
     private $path;
+    private $helper;
 
-    public function __construct($storage_path)
+    public function __construct($storage_path, $helper)
     {
         $this->path = $storage_path;
+        $this->helper = $helper;
     }
 
     public function __call($function_name, $arguments)
@@ -22,23 +24,14 @@ public function __call($function_name, $arguments)
     // TODO: check ending with slash in tests
     public function rootPath()
     {
-        return public_path() . '/';
+        return public_path() . $this->helper->ds();
     }
 
     public function url($path)
     {
         return '/' . $path;
     }
-
-    public function isDirectory()
-    {
-        $parent_path = substr($this->path, 0, strrpos($this->path, '/'));
-        $current_path = $this->path;
-        $this->path = $parent_path;
-
-        return in_array($current_path, $this->directories());
-    }
-
+    
     public function move($new_lfm_path)
     {
         return File::move($this->path, $new_lfm_path->path('storage'));

src/LfmPath.php

@@ -24,7 +24,7 @@ public function __construct(Lfm $lfm = null)
     public function __get($var_name)
     {
         if ($var_name == 'storage') {
-            return $this->helper->getStorage($this->path('storage'));
+            return $this->helper->getStorage($this->path('url'));
         }
     }
 
@@ -63,7 +63,7 @@ public function path($type = 'storage')
     {
         if ($type == 'working_dir') {
             // working directory: /{user_slug}
-            return $this->normalizeWorkingDir();
+            return $this->translateToLfmPath($this->normalizeWorkingDir());
         } elseif ($type == 'url') {
             // storage: files/{user_slug}
             return $this->helper->getCategoryName() . $this->path('working_dir');
@@ -78,6 +78,11 @@ public function path($type = 'storage')
         }
     }
 
+    public function translateToLfmPath($path)
+    {
+        return str_replace($this->helper->ds(), Lfm::DS, $path);
+    }
+
     public function translateToOsPath($path)
     {
         return str_replace(Lfm::DS, $this->helper->ds(), $path);
@@ -142,6 +147,25 @@ public function createFolder()
         $this->storage->makeDirectory(0777, true, true);
     }
 
+    public function isDirectory()
+    {
+        $working_dir = $this->path('working_dir');
+        $parent_dir = substr($working_dir, 0, strrpos($working_dir, '/'));
+
+        $parent_path = clone $this;
+        $parent_path->dir($parent_dir)->setName(null);
+
+        $directories = $parent_path->directories();
+
+        $that = $this;
+
+        $directories = array_map(function ($directory_path) use ($that) {
+            return $this->translateToLfmPath($directory_path);
+        }, $directories);
+
+        return in_array($this->path('url'), $directories);
+    }
+
     /**
      * Check a folder and its subfolders is empty or not.
      *

src/LfmStorageRepository.php

@@ -7,12 +7,13 @@
 class LfmStorageRepository implements RepositoryContract
 {
     private $disk;
-
     private $path;
+    private $helper;
 
-    public function __construct($storage_path, $disk_name)
+    public function __construct($storage_path, $helper)
     {
-        $this->disk = Storage::disk($disk_name);
+        $this->helper = $helper;
+        $this->disk = Storage::disk($this->helper->config('disk'));
         $this->path = $storage_path;
     }
 
@@ -28,15 +29,6 @@ public function rootPath()
         return $this->disk->getDriver()->getAdapter()->getPathPrefix();
     }
 
-    public function isDirectory()
-    {
-        $parent_path = substr($this->path, 0, strrpos($this->path, '/'));
-        $current_path = $this->path;
-        $this->path = $parent_path;
-
-        return in_array($current_path, $this->directories());
-    }
-
     public function move($new_lfm_path)
     {
         return $this->disk->move($this->path, $new_lfm_path->path('storage'));

src/controllers/FolderController.php

@@ -23,7 +23,7 @@ public function getFolders()
                     return (object) [
                         'name' => trans('laravel-filemanager::lfm.title-' . $type),
                         'url' => $path->path('working_dir'),
-                        'children' => $path->folders('name'),
+                        'children' => $path->folders(),
                         'has_next' => ! ($type == end($folder_types)),
                     ];
                 }, $folder_types),