Add suport of reading PNG JPEG Exif metadata

app/code/Magento/MediaGalleryMetadata/Model/GetIptcMetadata.php

@@ -9,7 +9,6 @@
 
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
 use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
-use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
 
 /**
  * Get metadata from IPTC block
@@ -42,8 +41,8 @@ public function __construct(
      */
     public function execute(string $data): MetadataInterface
     {
-        $title = '';
-        $description = '';
+        $title = null;
+        $description = null;
         $keywords = [];
 
         if (is_callable('iptcparse')) {
@@ -65,7 +64,7 @@ public function execute(string $data): MetadataInterface
         return $this->metadataFactory->create([
             'title' => $title,
             'description' => $description,
-            'keywords' => $keywords
+            'keywords' => !empty($keywords) ? $keywords : null
         ]);
     }
 }

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadExif.php

@@ -0,0 +1,104 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Jpeg\Segment;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\ReadMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Jpeg EXIF Reader
+ */
+class ReadExif implements ReadMetadataInterface
+{
+    private const EXIF_SEGMENT_NAME = 'APP1';
+    private const EXIF_SEGMENT_START = "Exif\x00";
+    private const EXIF_DATA_START_POSITION = 0;
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     */
+    public function __construct(
+        MetadataInterfaceFactory $metadataFactory
+    ) {
+        $this->metadataFactory = $metadataFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        if (!is_callable('exif_read_data')) {
+            throw new LocalizedException(
+                __('exif_read_data() must be enabled in php configuration')
+            );
+        }
+
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isExifSegment($segment)) {
+                return $this->getExifData($file->getPath());
+            }
+        }
+
+        return $this->metadataFactory->create([
+            'title' => null,
+            'description' => null,
+            'keywords' => null
+        ]);
+    }
+
+    /**
+     * Parese exif data from segment
+     *
+     * @param string $filePath
+     */
+    private function getExifData(string $filePath): MetadataInterface
+    {
+        $title = null;
+        $description = null;
+        $keywords = null;
+
+        $data = exif_read_data($filePath);
+
+        if (!empty($data)) {
+            $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
+            $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
+        }
+
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => $keywords
+        ]);
+    }
+
+    /**
+     * Does segment contain Exif data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isExifSegment(SegmentInterface $segment): bool
+    {
+        return $segment->getName() === self::EXIF_SEGMENT_NAME
+            && strncmp(
+                substr($segment->getData(), self::EXIF_DATA_START_POSITION, 5),
+                self::EXIF_SEGMENT_START,
+                5
+            ) == 0;
+    }
+}

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadIptc.php

@@ -56,9 +56,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 

app/code/Magento/MediaGalleryMetadata/Model/Jpeg/Segment/ReadXmp.php

@@ -54,9 +54,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 

app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadExif.php

@@ -0,0 +1,97 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaGalleryMetadata\Model\Png\Segment;
+
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterface;
+use Magento\MediaGalleryMetadataApi\Api\Data\MetadataInterfaceFactory;
+use Magento\MediaGalleryMetadataApi\Model\FileInterface;
+use Magento\MediaGalleryMetadataApi\Model\ReadMetadataInterface;
+use Magento\MediaGalleryMetadataApi\Model\SegmentInterface;
+use Magento\Framework\Exception\LocalizedException;
+
+/**
+ * Jpeg EXIF Reader
+ */
+class ReadExif implements ReadMetadataInterface
+{
+    private const EXIF_SEGMENT_NAME = 'eXIf';
+
+    /**
+     * @var MetadataInterfaceFactory
+     */
+    private $metadataFactory;
+
+    /**
+     * @param MetadataInterfaceFactory $metadataFactory
+     */
+    public function __construct(
+        MetadataInterfaceFactory $metadataFactory
+    ) {
+        $this->metadataFactory = $metadataFactory;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(FileInterface $file): MetadataInterface
+    {
+        if (!is_callable('exif_read_data')) {
+            throw new LocalizedException(
+                __('exif_read_data() must be enabled in php configuration')
+            );
+        }
+
+        foreach ($file->getSegments() as $segment) {
+            if ($this->isExifSegment($segment)) {
+                return $this->getExifData($segment);
+            }
+        }
+
+        return $this->metadataFactory->create([
+            'title' => null,
+            'description' => null,
+            'keywords' => null
+        ]);
+    }
+
+    /**
+     * Parese exif data from segment
+     *
+     * @param SegmentInterface $segment
+     */
+    private function getExifData(SegmentInterface $segment): MetadataInterface
+    {
+        $title = null;
+        $description = null;
+        $keywords = [];
+
+        $data = exif_read_data('data://image/jpeg;base64,' . base64_encode($segment->getData()));
+
+        if ($data) {
+            $title = isset($data['DocumentName']) ? $data['DocumentName'] : null;
+            $description = isset($data['ImageDescription']) ? $data['ImageDescription'] : null;
+        }
+
+        return $this->metadataFactory->create([
+            'title' => $title,
+            'description' => $description,
+            'keywords' => !empty($keywords) ? $keywords : null
+        ]);
+    }
+
+    /**
+     * Does segment contain Exif data
+     *
+     * @param SegmentInterface $segment
+     * @return bool
+     */
+    private function isExifSegment(SegmentInterface $segment): bool
+    {
+        return strcmp($segment->getName(), self::EXIF_SEGMENT_NAME) === 0;
+    }
+}

app/code/Magento/MediaGalleryMetadata/Model/Png/Segment/ReadXmp.php

@@ -55,9 +55,9 @@ public function execute(FileInterface $file): MetadataInterface
             }
         }
         return $this->metadataFactory->create([
-            'title' => '',
-            'description' => '',
-            'keywords' => []
+            'title' => null,
+            'description' => null,
+            'keywords' => null
         ]);
     }
 

app/code/Magento/MediaGalleryMetadata/Test/Integration/Model/ExtractMetadataTest.php

@@ -37,14 +37,14 @@ protected function setUp(): void
      * @param string $fileName
      * @param string $title
      * @param string $description
-     * @param array $keywords
+     * @param null|array $keywords
      * @throws LocalizedException
      */
     public function testExecute(
         string $fileName,
         string $title,
         string $description,
-        array $keywords
+        ?array $keywords
     ): void {
         $path = realpath(__DIR__ . '/../../_files/' . $fileName);
         $metadata = $this->extractMetadata->execute($path);
@@ -62,6 +62,18 @@ public function testExecute(
     public function filesProvider(): array
     {
         return [
+            [
+                'exif_image.png',
+                'Exif title png imge',
+                'Exif description png imge',
+                null
+            ],
+            [
+                'exif-image.jpeg',
+                'Exif Magento title',
+                'Exif description metadata',
+                 null
+            ],
             [
                 'macos-photos.jpeg',
                 'Title of the magento image',

app/code/Magento/MediaGalleryMetadata/etc/di.xml

@@ -112,6 +112,7 @@
             <argument name="segmentReaders" xsi:type="array">
                 <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\ReadXmp</item>
                 <item name="iptc" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\ReadIptc</item>
+                <item name="exif" xsi:type="object">Magento\MediaGalleryMetadata\Model\Png\Segment\ReadExif</item>
             </argument>
         </arguments>
     </virtualType>
@@ -121,6 +122,7 @@
             <argument name="segmentReaders" xsi:type="array">
                 <item name="xmp" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadXmp</item>
                 <item name="iptc" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadIptc</item>
+                <item name="exif" xsi:type="object">Magento\MediaGalleryMetadata\Model\Jpeg\Segment\ReadExif</item>
             </argument>
         </arguments>
     </virtualType>