fix naming

Author: sebastianMindee

src/Extraction/ImageExtractor.php

@@ -137,19 +137,37 @@ public function extractImagesFromPage(array $fields, int $pageIndex, ?string $ou
     /**
      * Extracts images from a page.
      *
-     * @param array       $polygons  List of polygons to extract.
-     * @param integer     $pageIndex The page index to extract, begins at 0.
-     * @param null|string $format    Save format for extracted images. Defaults to the original format.
+     * @param array       $polygons       List of polygons to extract.
+     * @param integer     $pageIndex      The page index to extract, begins at 0.
+     * @param null|string $filenamePrefix Output filename prefix.
+     * @param null|string $format         Save format for extracted images. Defaults to the original format.
      *
      * @return array an array of created images
+     * @throws MindeeImageException Throws if the image can't be processed.
      */
-    public function extractPolygonsFromPage(array $polygons, int $pageIndex, ?string $format = null): array
-    {
+    public function extractPolygonsFromPage(
+        array $polygons,
+        int $pageIndex,
+        ?string $filenamePrefix = null,
+        ?string $format = null
+    ): array {
         $saveFormat = $format ?? $this->saveFormat;
         $extractedImages = [];
 
-        foreach ($polygons as $i => $polygon) {
-            $extractedImages[] = $this->extractPolygonFromPage($polygon, $pageIndex, $i, null, $format);
+        try {
+            foreach ($polygons as $i => $polygon) {
+                $filenamePrefix ??= $this->filename;
+                $outputFilename = sprintf('%s-%d.%s', $filenamePrefix, $i, $saveFormat);
+                $extractedImages[] = $this->extractPolygonFromPage(
+                    $polygon,
+                    $pageIndex,
+                    $i,
+                    $outputFilename,
+                    $saveFormat
+                );
+            }
+        } catch (\ImagickException $e) {
+            throw new MindeeImageException($e->getMessage(), $e->getCode(), $e);
         }
 
         return $extractedImages;
@@ -165,7 +183,7 @@ public function extractPolygonsFromPage(array $polygons, int $pageIndex, ?string
      * @param null|string $format    Output format.
      *
      * @return ExtractedImage Extracted image data.
-     * @throws \ImagickException Throws if the image can't be processed.
+     * @throws MindeeImageException Throws if the image can't be processed.
      */
     public function extractPolygonFromPage(
         Polygon $polygon,
@@ -175,11 +193,14 @@ public function extractPolygonFromPage(
         ?string $format = null
     ): ExtractedImage {
         $bbox = BBoxUtils::generateBBoxFromPolygon($polygon);
-        $extractedImageData = $this->extractImageFromBbox($bbox, $pageIndex);
+        try {
+            $extractedImageData = $this->extractImageFromBbox($bbox, $pageIndex);
+        } catch (\ImagickException $e) {
+            throw new MindeeImageException($e->getMessage(), $e->getCode(), $e);
+        }
         $filename ??= $this->filename;
         $format ??= $this->saveFormat;
         $filename ??= sprintf('%s.%s_page%d-%d.%s', $filename, $format, $pageIndex, $index, $format);
-
         return new ExtractedImage($extractedImageData, $filename, $format, $pageIndex, $index);
     }
 

src/V2/FileOperations/Crop.php

@@ -55,10 +55,12 @@ public function extractCrops(array $crops): CropFiles
 
         foreach ($cropsPerPage as $page => $pageCrops) {
             $polygons = array_map(fn ($c) => $c->location->polygon, $pageCrops);
+            $filenamePrefix = sprintf('%s_page%d', $this->localInput->fileName, $page);
 
             $images = $imageExtractor->extractPolygonsFromPage(
                 $polygons,
-                $page
+                $page,
+                $filenamePrefix
             );
             array_push($extractedImages, ...$images);
         }

tests/V2/FileOperations/CropFunctional.php

@@ -80,11 +80,11 @@ public function testExtractCropsFromImageCorrectly(): void
         $extractedImages->saveAllToDisk($this->outputDir, quality: 50);
 
         $file1Info = filesize($this->outputDir . '/crop_001.jpg');
-        $this->assertGreaterThanOrEqual(99000, $file1Info);
+        $this->assertGreaterThanOrEqual(98000, $file1Info);
         $this->assertLessThanOrEqual(110000, $file1Info);
 
         $file2Info = filesize($this->outputDir . '/crop_002.jpg');
-        $this->assertGreaterThanOrEqual(99000, $file2Info);
+        $this->assertGreaterThanOrEqual(98000, $file2Info);
         $this->assertLessThanOrEqual(110000, $file2Info);
     }