Save export files as a stream

Author: karlomikus

app/External/Export/ToDataPack.php

@@ -80,12 +80,19 @@ public function process(int $barId, ?string $filename = null, ForceUnitConvertEn
         $fullPath = $barId . '/' . $filename;
         Log::debug(sprintf('Moving datapack temporary file from "%s" to exports disk at "%s"', $tempFilePath, $fullPath));
         $this->file->makeDirectory((string) $barId);
-        $contents = file_get_contents($tempFilePath);
-        if ($contents === false) {
+        $stream = fopen($tempFilePath, 'r');
+        if ($stream === false) {
             throw new ExportFileNotCreatedException('Could not read temporary export file contents');
         }
 
-        $this->file->put($fullPath, $contents);
+        try {
+            $this->file->put($fullPath, $stream);
+        } finally {
+            if (is_resource($stream)) {
+                fclose($stream);
+            }
+            unlink($tempFilePath);
+        }
 
         return $fullPath;
     }

app/External/Export/ToRecipeType.php

@@ -70,12 +70,19 @@ public function process(int $barId, ?string $filename = null, ExportTypeEnum $ty
         $fullPath = $barId . '/' . $filename;
         Log::debug(sprintf('Moving temporary file from "%s" to exports disk at "%s"', $tempFilePath, $fullPath));
         $this->file->makeDirectory((string) $barId);
-        $contents = file_get_contents($tempFilePath);
-        if ($contents === false) {
+        $stream = fopen($tempFilePath, 'r');
+        if ($stream === false) {
             throw new ExportFileNotCreatedException('Could not read temporary export file contents');
         }
 
-        $this->file->put($fullPath, $contents);
+        try {
+            $this->file->put($fullPath, $stream);
+        } finally {
+            if (is_resource($stream)) {
+                fclose($stream);
+            }
+            unlink($tempFilePath);
+        }
 
         return $fullPath;
     }

app/External/Model/CocktailIngredient.php

@@ -39,7 +39,7 @@ public static function fromModel(CocktailIngredientModel $model, ?Units $toUnits
         }
 
         return new self(
-            Ingredient::fromModel($model->ingredient),
+            Ingredient::fromModelBasic($model->ingredient),
             $amount,
             (bool) $model->optional,
             (bool) $model->is_specified,

app/External/Model/CocktailIngredientSubstitute.php

@@ -29,7 +29,7 @@ public static function fromModel(CocktailIngredientSubstituteModel $model, ?Unit
         }
 
         return new self(
-            Ingredient::fromModel($model->ingredient),
+            Ingredient::fromModelBasic($model->ingredient),
             $amount,
         );
     }

app/External/Model/Ingredient.php

@@ -47,7 +47,7 @@ public static function fromModel(IngredientModel $model, bool $useFileURI = fals
     {
         $images = $model->images->map(fn (ImageModel $image) => Image::fromModel($image, $useFileURI))->toArray();
 
-        $ingredientParts = $model->ingredientParts->map(fn (ComplexIngredient $part) => Ingredient::fromModel($part->ingredient))->toArray();
+        $ingredientParts = $model->ingredientParts->map(fn (ComplexIngredient $part) => Ingredient::fromModelBasic($part->ingredient))->toArray();
 
         $ingredientPrices = $model->prices->map(fn (IngredientPriceModel $price) => IngredientPrice::fromModel($price))->toArray();
 
@@ -78,6 +78,18 @@ public static function fromModel(IngredientModel $model, bool $useFileURI = fals
         );
     }
 
+    public static function fromModelBasic(IngredientModel $model): self
+    {
+        return new self(
+            id: $model->getExternalId(),
+            name: $model->name,
+            strength: $model->strength,
+            description: $model->description,
+            origin: $model->origin,
+            color: $model->color,
+        );
+    }
+
     public static function fromDataPackArray(array $sourceArray): self
     {
         $images = [];