Merge pull request #176 from andersundsehr/bugfix/clear-transient-file

Fix growing var/transient folder contents to get (image) sizes

Author: weakbit

Classes/Index/Extractor.php

@@ -15,6 +15,9 @@
 namespace AUS\AusDriverAmazonS3\Index;
 
 use AUS\AusDriverAmazonS3\Driver\AmazonS3Driver;
+use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException;
+use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Resource\File;
 use TYPO3\CMS\Core\Resource\FileInterface;
 use TYPO3\CMS\Core\Resource\Index\ExtractorInterface;
@@ -30,6 +33,16 @@
  */
 class Extractor implements ExtractorInterface
 {
+    private ?FrontendInterface $cache = null;
+
+    public function __construct()
+    {
+        try {
+            $this->cache = GeneralUtility::makeInstance(CacheManager::class)->getCache('runtime');
+        } catch (NoSuchCacheException) {
+        }
+    }
+
     /**
      * Returns an array of supported file types;
      * An empty array indicates all filetypes
@@ -122,11 +135,23 @@ public function extractMetaData(File $file, array $previousExtractedData = [])
      */
     public function getImageDimensionsOfRemoteFile(FileInterface $file): array
     {
+        $identifier = 'andersundsehr_aus_driver_amazon_s3_' . sha1($file->getIdentifier());
+        if ($this->cache?->has($identifier)) {
+            $sizes = $this->cache->get($identifier);
+            if (is_array($sizes) && count($sizes) === 2) {
+                return $sizes;
+            }
+        }
+
         $fileNameAndPath = $file->getForLocalProcessing(false);
         $imageInfo = GeneralUtility::makeInstance(ImageInfo::class, $fileNameAndPath);
-        return [
+        $sizes = [
             $imageInfo->getWidth(),
             $imageInfo->getHeight(),
         ];
+
+        $this->cache?->set($identifier, $sizes);
+        GeneralUtility::unlink_tempfile($fileNameAndPath);
+        return $sizes;
     }
 }

README.md

@@ -177,3 +177,12 @@ If you wish other hooks - don’t be shy: [GitHub issue tracking: Amazon S3 FAL
 ## Running tests
 
 Run `make tests` to run both unit and functional tests.
+
+To switch TYPO3 test version to 11:
+```bash
+composer update --with typo3/cms-core:^11.5.6
+```
+To switch TYPO3 test version to 12:
+```bash
+composer update --with typo3/cms-core:^12.4.0 --ignore-platform-req=ext-intl
+```

Tests/Unit/S3Adapter/MetaInfoDownloadAdapterTest.php

@@ -19,6 +19,7 @@
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
+use TYPO3\CMS\Core\Information\Typo3Version;
 use TYPO3\CMS\Core\Resource\MimeTypeCompatibilityTypeGuesser;
 use TYPO3\CMS\Core\Type\File\FileInfo;
 use TYPO3\CMS\Core\Utility\PathUtility;
@@ -52,7 +53,9 @@ public function setUp(): void
         parent::setUp();
         $this->metaInfoDownloadAdapter = new MetaInfoDownloadAdapter();
         $this->driver = $this->prophesize(AmazonS3Driver::class);
-        $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][FileInfo::class]['mimeTypeGuessers'][MimeTypeCompatibilityTypeGuesser::class] = MimeTypeCompatibilityTypeGuesser::class . '->guessMimeType';
+        if ((new Typo3Version())->getMajorVersion() > 11) {
+            $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][FileInfo::class]['mimeTypeGuessers'][MimeTypeCompatibilityTypeGuesser::class] = MimeTypeCompatibilityTypeGuesser::class . '->guessMimeType';
+        }
     }
 
     /**

composer.json

@@ -9,16 +9,16 @@
   },
   "license": "LGPL-3.0-or-later",
   "require": {
-    "php": ">=7.4",
-    "typo3/cms-core": "^11.5.6 || ^12.4.5",
+    "php": ">=8.2.0 <8.5.0",
+    "typo3/cms-core": "~v11.5.41 || ~v12.4.36",
     "aws/aws-sdk-php": "^3.288"
   },
   "require-dev": {
     "pluswerk/grumphp-config": "^5.0",
-    "typo3/testing-framework": "^8.0",
-    "phpspec/prophecy": "dev-master",
-    "phpspec/prophecy-phpunit": "dev-master",
-    "saschaegerer/phpstan-typo3": "^1.8.9",
+    "typo3/testing-framework": "^7.1.1 || ^8.2.7",
+    "phpspec/prophecy": "^1.22.0",
+    "phpspec/prophecy-phpunit": "^2.4.0",
+    "saschaegerer/phpstan-typo3": "^1.10.2",
     "ssch/typo3-rector": "^1.3.5"
   },
   "autoload": {