Merge pull request #335 from karlomikus/develop

Fix filename check #333
karlomikus · Sep 22, 2024 · 8652746 · 8652746
2 parents 1395008 + d02c42a
commit 8652746
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# v4.0.2
+## Fixes
+- Fixed a bug where the bar import command checked the wrong filepath
+
 # v4.0.1
 ## Fixes
 - Fixed a bug where cocktails with substitutes + any other filter were not being filtered correctly

diff --git a/app/Console/Commands/BarImportRecipes.php b/app/Console/Commands/BarImportRecipes.php
@@ -56,13 +56,14 @@ public function handle(): int
             return Command::FAILURE;
         }
 
-        $filename = $zipFileDisk->path($filename);
         if (!$zipFileDisk->exists($filename)) {
             $this->error(sprintf('File "%s" does not exist.', $filename));
 
             return Command::FAILURE;
         }
 
+        $filename = $zipFileDisk->path($filename);
+
         $zip = new ZipArchive();
         if ($zip->open($filename) !== true) {
             $this->error(sprintf('Unable to open zip file: "%s"', $filename));