[import] check if path exists

SlovakNationalGallery · Nov 9, 2024 · 77f1e6a · 77f1e6a
1 parent 1465aff
commit 77f1e6a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/app/Import.php b/app/Import.php
@@ -81,7 +81,12 @@ public function csvFiles(): Collection
 
     public function files(string $dir = null): Collection
     {
-        $files = $this->storage()->files($dir ?? $this->dir_path);
+        $dir ??= $this->dir_path;
+        if (!$this->storage()->exists($dir)) {
+            return collect();
+        }
+
+        $files = $this->storage()->files($dir);
         return collect($files)->map(fn(string $file) => new SplFileInfo($file));
     }
 

diff --git a/app/ImportRecord.php b/app/ImportRecord.php
@@ -56,6 +56,11 @@ public function iipFiles(): Collection
             pathinfo($this->filename, PATHINFO_FILENAME)
         );
         $disk = config('import.iip_disk');
+
+        if (!Storage::disk($disk)->exists($dir)) {
+            return collect();
+        }
+
         $files = Storage::disk($disk)->files($dir);
         return collect($files)->map(fn(string $file) => new SplFileInfo($file));
     }

diff --git a/database/factories/ImportFactory.php b/database/factories/ImportFactory.php
@@ -20,6 +20,7 @@ public function definition()
         return [
             'name' => fake()->text(),
             'class_name' => MgImporter::class,
+            'dir_path' => '.',
         ];
     }
 }