Merge pull request #79 from BBS-Lab/develop

fix(upload): fix an issue where a file could not be uploaded in a subdirectory when a file with same name exists in the root directory

src/Rules/FileMissingInFilesystem.php

@@ -4,14 +4,15 @@
 
 namespace BBSLab\NovaFileManager\Rules;
 
-use BBSLab\NovaFileManager\Http\Requests\BaseRequest;
+use BBSLab\NovaFileManager\Http\Requests\UploadFileRequest;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Support\Str;
 
 class FileMissingInFilesystem implements Rule
 {
     public ?string $path = null;
 
-    public function __construct(public BaseRequest $request)
+    public function __construct(public UploadFileRequest $request)
     {
     }
 
@@ -22,16 +23,16 @@ public function __construct(public BaseRequest $request)
      */
     public function passes($attribute, $value): bool
     {
-        $this->path = $value->getClientOriginalName();
+        $this->path = Str::finish($this->request->path, '/').$value->getClientOriginalName();
 
         return $this->request
             ->manager()
             ->filesystem()
-            ->missing($value->getClientOriginalName());
+            ->missing($this->path);
     }
 
     public function message(): string
     {
-        return __('nova-file-manager::validation.path.missing', ['path' => $this->path]);
+        return __('nova-file-manager::validation.path.exists', ['path' => $this->path]);
     }
 }