Better unpacked dump detection (#62)

* Better unpacked dump detection * Mark hasNoDbDumpsDirectory as deprecated --------- Co-authored-by: Stefan Zweifel <[email protected]>
stefanzweifel · Jan 31, 2024 · 67edf10 · 67edf10
1 parent b033e22
commit 67edf10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Actions/ImportDumpAction.php b/src/Actions/ImportDumpAction.php
@@ -24,14 +24,14 @@ class ImportDumpAction
      */
     public function execute(PendingRestore $pendingRestore): void
     {
-        if ($pendingRestore->hasNoDbDumpsDirectory()) {
+        $dbDumps = $pendingRestore->getAvailableDbDumps();
+
+        if ($dbDumps->isEmpty()) {
             throw NoDatabaseDumpsFound::notFoundInBackup($pendingRestore);
         }
 
         $importer = DbImporterFactory::createFromConnection($pendingRestore->connection);
 
-        $dbDumps = $pendingRestore->getAvailableDbDumps();
-
         info('Importing database '.str('dump')->plural($dbDumps)->__toString().' …');
 
         $dbDumps->each(function ($dbDump) use ($pendingRestore, $importer) {

diff --git a/src/PendingRestore.php b/src/PendingRestore.php
@@ -60,6 +60,7 @@ public function getAbsolutePathToLocalDecompressedBackup(): string
         return storage_path('app'.DIRECTORY_SEPARATOR.'backup-restore-temp'.DIRECTORY_SEPARATOR.$filename);
     }
 
+    /** @deprecated  */
     public function hasNoDbDumpsDirectory(): bool
     {
         return ! Storage::disk($this->restoreDisk)