fix issue with directory closes #4

dcasia · Oct 8, 2019 · 0c57d2c · 0c57d2c
1 parent 0f57b96
commit 0c57d2c
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/Filepond.php b/src/Filepond.php
@@ -120,7 +120,7 @@ public function withoutDoka(): self
     public function disk(string $disk, string $directory = null)
     {
         $this->disk = $disk;
-        $this->directory = $directory;
+        $this->directory = trim(rtrim($directory, '/'), '/');
 
         return $this;
     }
@@ -208,7 +208,7 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib
 
         if ($this->multiple === false) {
 
-            $serverId = $request->input($requestAttribute);
+            $serverId = static::getPathFromServerId($request->input($requestAttribute));
 
             /**
              * If no changes were made the first image should match the given serverId
@@ -221,7 +221,7 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib
 
             $this->removeImages($currentImages);
 
-            $file = new File(static::getPathFromServerId($serverId));
+            $file = new File($serverId);
 
             $model->setAttribute($attribute, $this->moveFile($file));
 
@@ -232,7 +232,9 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib
         /**
          * If it`s a multiple files request
          */
-        $files = collect(explode(',', $request->input($requestAttribute)));
+        $files = collect(explode(',', $request->input($requestAttribute)))->map(function ($file) {
+            return static::getPathFromServerId($file);
+        });
 
         $toKeep = $files->intersect($currentImages); // files that exist on the request and on the model
         $toAppend = $files->diff($currentImages); // files that exist only on the request
@@ -242,7 +244,7 @@ protected function fillAttributeFromRequest(NovaRequest $request, $requestAttrib
 
         foreach ($toAppend as $serverId) {
 
-            $file = new File(static::getPathFromServerId($serverId));
+            $file = new File($serverId);
 
             $toKeep->push($this->moveFile($file));
 
@@ -257,8 +259,7 @@ private function moveFile(File $file): string
 
         $name = $this->storeAsCallback ? call_user_func($this->storeAsCallback, $file) : null;
 
-        return $file->move(Storage::disk($this->disk)->path($this->directory), $name)
-                    ->getBasename();
+        return $this->directory . '/' . $file->move(Storage::disk($this->disk)->path($this->directory), $name)->getBasename();
 
     }
 
@@ -288,9 +289,7 @@ protected function resolveAttribute($resource, $attribute): Collection
 
         return collect($value)->map(function ($value) {
             return [
-                'source' => $this->getServerIdFromPath(
-                    trim(rtrim($this->directory, '/') . '/' . $value, '/')
-                ),
+                'source' => $this->getServerIdFromPath($value),
                 'options' => [
                     'type' => 'local'
                 ]