Use preview images as original for most assets; use title for filename

flownative · Jun 13, 2018 · 71bbdc8 · 71bbdc8
1 parent 0aeb917
commit 71bbdc8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/Classes/AssetSource/PixxioAssetProxy.php b/Classes/AssetSource/PixxioAssetProxy.php
@@ -13,6 +13,7 @@
  * source code.
  */
 
+use Behat\Transliterator\Transliterator;
 use Neos\Flow\Http\Uri;
 use Neos\Media\Domain\Model\AssetSource\AssetProxy\AssetProxyInterface;
 use Neos\Media\Domain\Model\AssetSource\AssetProxy\HasRemoteOriginalInterface;
@@ -98,14 +99,18 @@ final class PixxioAssetProxy implements AssetProxyInterface, HasRemoteOriginalIn
      */
     static public function fromJsonObject(\stdClass $jsonObject, PixxioAssetSource $assetSource)
     {
+        $usePixxioThumbnailAsOriginal = !in_array($jsonObject->fileType, ['JPG', 'PNG', 'SVG', 'PDF']);
+
+        $modifiedFileType = $usePixxioThumbnailAsOriginal ? 'jpg' : strtolower($jsonObject->fileType);
+
         $assetProxy = new static();
         $assetProxy->assetSource = $assetSource;
         $assetProxy->identifier = $jsonObject->id;
         $assetProxy->label = $jsonObject->subject;
-        $assetProxy->filename = $jsonObject->originalFilename;
+        $assetProxy->filename = Transliterator::urlize($jsonObject->subject) . '.' . $modifiedFileType;
         $assetProxy->lastModified = new \DateTime($jsonObject->modifyDate ?? '1.1.2000');
         $assetProxy->fileSize = $jsonObject->fileSize;
-        $assetProxy->mediaType = MediaTypes::getMediaTypeFromFilename('foo.' . $jsonObject->fileType);
+        $assetProxy->mediaType = MediaTypes::getMediaTypeFromFilename('foo.' . $modifiedFileType);
 
         $assetProxy->iptcProperties['Title'] = $jsonObject->subject ?? '';
         $assetProxy->iptcProperties['CaptionAbstract'] = $jsonObject->description ?? '';
@@ -122,16 +127,22 @@ static public function fromJsonObject(\stdClass $jsonObject, PixxioAssetSource $
                 if (isset($modifiedImagePaths[1])) {
                     $assetProxy->previewUri = new Uri($modifiedImagePaths[1]);
                 }
+                if (isset($modifiedImagePaths[2])) {
+                    $assetProxy->originalUri = new Uri($modifiedImagePaths[2]);
+                }
             } else if (is_object($modifiedImagePaths)) {
                 if (isset($modifiedImagePaths->{'0'})) {
                     $assetProxy->thumbnailUri = new Uri($modifiedImagePaths->{'0'});
                 }
                 if (isset($modifiedImagePaths->{'1'})) {
                     $assetProxy->previewUri = new Uri($modifiedImagePaths->{'1'});
                 }
+                if (isset($modifiedImagePaths->{'2'})) {
+                    $assetProxy->originalUri = new Uri($modifiedImagePaths->{'2'});
+                }
             }
         }
-        if (isset($jsonObject->originalPath)) {
+        if (!$usePixxioThumbnailAsOriginal && isset($jsonObject->originalPath)) {
             $assetProxy->originalUri = new Uri($jsonObject->originalPath);
         }
         return $assetProxy;

diff --git a/Classes/AssetSource/PixxioAssetProxyQuery.php b/Classes/AssetSource/PixxioAssetProxyQuery.php
@@ -259,7 +259,7 @@ private function sendSearchRequest(int $limit, array $orderings): Response
             break;
             case 'All':
             default:
-                $formatTypes = [];
+                $formatTypes = ['converted'];
                 $fileTypes = [];
             break;
         }

diff --git a/Classes/Service/PixxioClient.php b/Classes/Service/PixxioClient.php
@@ -78,6 +78,10 @@ public function __construct(string $apiEndpointUri, string $apiKey)
                 'width' => 1500,
                 'height' => 1500,
                 'quality' => 90
+            ],
+            (object)[
+                'sizeMax' => 1920,
+                'quality' => 90
             ]
         ];
     }

diff --git a/composer.json b/composer.json
@@ -5,7 +5,8 @@
   "license": "MIT",
   "require": {
     "neos/flow": "5.* || dev-master",
-    "guzzlehttp/guzzle": "6.*"
+    "guzzlehttp/guzzle": "6.*",
+    "behat/transliterator": "~1.0"
   },
   "autoload": {
     "psr-4": {