fabarea / media

Classes/Thumbnail/FallBackThumbnailProcessor.php

Indentation +33 added lines, -33 removed lines

@@ -15,40 +15,40 @@
  */
 class FallBackThumbnailProcessor extends AbstractThumbnailProcessor
 {
-    /**
-     * Render a fallback thumbnail if no type was found for the given resource.
-     */
-    public function create(): string
-    {
-        return sprintf(
-            '<img src="%s" hspace="2" class="" alt="" />',
-            Path::getRelativePath('Icons/UnknownMimeType.png')
-        );
-    }
+	/**
+	 * Render a fallback thumbnail if no type was found for the given resource.
+	 */
+	public function create(): string
+	{
+		return sprintf(
+			'<img src="%s" hspace="2" class="" alt="" />',
+			Path::getRelativePath('Icons/UnknownMimeType.png')
+		);
+	}
 
-    /**
-     * Render the URI of the thumbnail.
-     */
-    public function renderUri(): string
-    {
-        return '';
-    }
+	/**
+	 * Render the URI of the thumbnail.
+	 */
+	public function renderUri(): string
+	{
+		return '';
+	}
 
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     */
-    public function renderTagImage($result): string
-    {
-        return '';
-    }
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 */
+	public function renderTagImage($result): string
+	{
+		return '';
+	}
 
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     */
-    public function renderTagAnchor($result): string
-    {
-        return '';
-    }
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 */
+	public function renderTagAnchor($result): string
+	{
+		return '';
+	}
 }

Classes/Thumbnail/ImageThumbnailProcessor.php

Indentation +161 added lines, -161 removed lines

@@ -15,165 +15,165 @@
  */
 class ImageThumbnailProcessor extends AbstractThumbnailProcessor
 {
-    protected array $defaultConfigurationWrap = [
-        'width' => 0,
-        'height' => 0,
-    ];
-
-    /**
-     * Render a thumbnail of a resource of type image.
-     */
-    public function create(): string
-    {
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     */
-    public function renderUri(): string
-    {
-        // Makes sure the width and the height of the thumbnail is not bigger than the actual file
-        $configuration = $this->getConfiguration();
-        if (!empty($configuration['width']) && $configuration['width'] > $this->getFile()->getProperty('width')) {
-            $configuration['width'] = $this->getFile()->getProperty('width');
-        }
-        if (!empty($configuration['height']) && $configuration['height'] > $this->getFile()->getProperty('height')) {
-            $configuration['height'] = $this->getFile()->getProperty('height');
-        }
-
-        $configuration = $this->computeFinalImageDimension($configuration);
-        $this->processedFile = $this->getFile()->process($this->getProcessingType(), $configuration);
-        $uri = $this->processedFile->getPublicUrl(true);
-
-        // Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
-        if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
-            $this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
-        }
-
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagImage($result): string
-    {
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf(
-            '<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the title of the file.
-     */
-    protected function getTitle(): string
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (!$result) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagAnchor($result): string
-    {
-        $file = $this->getFile();
-
-        // Perhaps the wrapping file must be processed
-        $configurationWrap = $this->thumbnailService->getConfigurationWrap();
-
-        // Make sure we have configurationWrap initialized correctly
-        if (!empty($configurationWrap['width']) || !empty($configurationWrap['height'])) {
-            $configurationWrap = array_merge($this->defaultConfigurationWrap, $configurationWrap);
-
-            // It looks maxW or maxH does not work as expected with CONTEXT_IMAGEPREVIEW...
-            // ... uses "width" and "height" instead.
-            if ($configurationWrap['width'] < $this->getFile()->getProperty('width')
-                || $configurationWrap['height'] < $this->getFile()->getProperty('height')
-            ) {
-                $configurationWrap = $this->computeFinalImageDimension($configurationWrap);
-                $file = $this->getFile()->process($this->getProcessingType(), $configurationWrap);
-            }
-        }
-
-        // Analyse the current $url and compute the adequate separator between arguments.
-        $url = $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true);
-        $parameterSeparator = strpos($url, '?') === false ? '?' : '&';
-
-        return sprintf(
-            '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
-            $url,
-            $this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
-            $this->thumbnailService->getTarget(),
-            $file->getUid(),
-            $result
-        );
-    }
-
-    /**
-     * Compute the final configuration for the image preview.
-     * Keep ratio of width / height for the image.
-     *
-     * @param array $configuration
-     */
-    protected function computeFinalImageDimension(array $configuration): array
-    {
-        $ratio = $this->computeImageRatio();
-
-        if ($ratio > 1) {
-            $configuration['height'] = round($configuration['width'] / $ratio);
-        } else {
-            $configuration['width'] = round($configuration['height'] * $ratio);
-        }
-        return $configuration;
-    }
-
-    /**
-     * Compute the width / height ratio of the image.
-     *
-     * @return null|float
-     */
-    protected function computeImageRatio()
-    {
-        $ratio = null;
-        if ($this->getFile()->getProperty('width') > 0 && $this->getFile()->getProperty('height') > 0) {
-            $ratio = $this->getFile()->getProperty('width') / $this->getFile()->getProperty('height');
-        }
-        return $ratio;
-    }
-
-    /**
-     * @return string
-     */
-    public function getProcessingType(): string
-    {
-        if (!$this->thumbnailService->getProcessingType()) {
-            return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
-        }
-        return $this->thumbnailService->getProcessingType();
-    }
+	protected array $defaultConfigurationWrap = [
+		'width' => 0,
+		'height' => 0,
+	];
+
+	/**
+	 * Render a thumbnail of a resource of type image.
+	 */
+	public function create(): string
+	{
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 */
+	public function renderUri(): string
+	{
+		// Makes sure the width and the height of the thumbnail is not bigger than the actual file
+		$configuration = $this->getConfiguration();
+		if (!empty($configuration['width']) && $configuration['width'] > $this->getFile()->getProperty('width')) {
+			$configuration['width'] = $this->getFile()->getProperty('width');
+		}
+		if (!empty($configuration['height']) && $configuration['height'] > $this->getFile()->getProperty('height')) {
+			$configuration['height'] = $this->getFile()->getProperty('height');
+		}
+
+		$configuration = $this->computeFinalImageDimension($configuration);
+		$this->processedFile = $this->getFile()->process($this->getProcessingType(), $configuration);
+		$uri = $this->processedFile->getPublicUrl(true);
+
+		// Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
+		if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
+			$this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
+		}
+
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagImage($result): string
+	{
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 */
+	protected function getTitle(): string
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (!$result) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagAnchor($result): string
+	{
+		$file = $this->getFile();
+
+		// Perhaps the wrapping file must be processed
+		$configurationWrap = $this->thumbnailService->getConfigurationWrap();
+
+		// Make sure we have configurationWrap initialized correctly
+		if (!empty($configurationWrap['width']) || !empty($configurationWrap['height'])) {
+			$configurationWrap = array_merge($this->defaultConfigurationWrap, $configurationWrap);
+
+			// It looks maxW or maxH does not work as expected with CONTEXT_IMAGEPREVIEW...
+			// ... uses "width" and "height" instead.
+			if ($configurationWrap['width'] < $this->getFile()->getProperty('width')
+				|| $configurationWrap['height'] < $this->getFile()->getProperty('height')
+			) {
+				$configurationWrap = $this->computeFinalImageDimension($configurationWrap);
+				$file = $this->getFile()->process($this->getProcessingType(), $configurationWrap);
+			}
+		}
+
+		// Analyse the current $url and compute the adequate separator between arguments.
+		$url = $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true);
+		$parameterSeparator = strpos($url, '?') === false ? '?' : '&';
+
+		return sprintf(
+			'<a href="%s%s" target="%s" data-uid="%s">%s</a>',
+			$url,
+			$this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
+			$this->thumbnailService->getTarget(),
+			$file->getUid(),
+			$result
+		);
+	}
+
+	/**
+	 * Compute the final configuration for the image preview.
+	 * Keep ratio of width / height for the image.
+	 *
+	 * @param array $configuration
+	 */
+	protected function computeFinalImageDimension(array $configuration): array
+	{
+		$ratio = $this->computeImageRatio();
+
+		if ($ratio > 1) {
+			$configuration['height'] = round($configuration['width'] / $ratio);
+		} else {
+			$configuration['width'] = round($configuration['height'] * $ratio);
+		}
+		return $configuration;
+	}
+
+	/**
+	 * Compute the width / height ratio of the image.
+	 *
+	 * @return null|float
+	 */
+	protected function computeImageRatio()
+	{
+		$ratio = null;
+		if ($this->getFile()->getProperty('width') > 0 && $this->getFile()->getProperty('height') > 0) {
+			$ratio = $this->getFile()->getProperty('width') / $this->getFile()->getProperty('height');
+		}
+		return $ratio;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getProcessingType(): string
+	{
+		if (!$this->thumbnailService->getProcessingType()) {
+			return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
+		}
+		return $this->thumbnailService->getProcessingType();
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
         return sprintf(
             '<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->processedFile->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->processedFile->getProperty('tstamp') : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()
@@ -127,7 +127,7 @@ 
         return sprintf(
             '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
             $url,
-            $this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator . $file->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() && !$this->thumbnailService->getAnchorUri() ? $parameterSeparator.$file->getProperty('tstamp') : '',
             $this->thumbnailService->getTarget(),
             $file->getUid(),
             $result

Classes/Thumbnail/AbstractThumbnailProcessor.php

Indentation +130 added lines, -130 removed lines

@@ -23,134 +23,134 @@
  */
 abstract class AbstractThumbnailProcessor implements ThumbnailProcessorInterface
 {
-    /**
-     * @var ThumbnailService
-     */
-    protected $thumbnailService;
-
-    /**
-     * Store a Processed File along the processing.
-     *
-     * @var ProcessedFile
-     */
-    protected $processedFile;
-
-    /**
-     * Define what are the rendering steps for a thumbnail.
-     */
-    protected array $renderingSteps = [
-        ThumbnailInterface::OUTPUT_URI => 'renderUri',
-        ThumbnailInterface::OUTPUT_IMAGE => 'renderTagImage',
-        ThumbnailInterface::OUTPUT_IMAGE_WRAPPED => 'renderTagAnchor',
-    ];
-
-    public function setThumbnailService(ThumbnailService $thumbnailService): AbstractThumbnailProcessor
-    {
-        $this->thumbnailService = $thumbnailService;
-        return $this;
-    }
-
-    /**
-     * Return what needs to be rendered
-     */
-    protected function getRenderingSteps(): array
-    {
-        $position = array_search($this->thumbnailService->getOutputType(), array_keys($this->renderingSteps));
-        return array_slice($this->renderingSteps, 0, $position + 1);
-    }
-
-
-    /**
-     * Render additional attribute for this DOM element.
-     */
-    protected function renderAttributes(): string
-    {
-        $result = '';
-        $attributes = $this->thumbnailService->getAttributes();
-        if (is_array($attributes)) {
-            foreach ($attributes as $attribute => $value) {
-                $result .= sprintf(
-                    '%s="%s" ',
-                    htmlspecialchars($attribute),
-                    htmlspecialchars($value)
-                );
-            }
-        }
-        return $result;
-    }
-
-    protected function getConfiguration(): array
-    {
-        $configuration = $this->thumbnailService->getConfiguration();
-        if (!$configuration) {
-            $dimension = ImagePresetUtility::getInstance()->preset('image_thumbnail');
-            $configuration = array(
-                'width' => $dimension->getWidth(),
-                'height' => $dimension->getHeight(),
-            );
-        }
-        return $configuration;
-    }
-
-    /**
-     * Returns a path to an icon given an extension.
-     *
-     * @param string $extension File extension
-     */
-    protected function getIcon($extension): string
-    {
-        $resource = Path::getRelativePath(sprintf('Icons/MimeType/%s.png', $extension));
-
-        // If file is not found, fall back to a default icon
-        if (Path::notExists($resource)) {
-            $resource = Path::getRelativePath('Icons/MissingMimeTypeIcon.png');
-        }
-
-        return $resource;
-    }
-
-    /**
-     * @param string $uri
-     */
-    public function prefixUri($uri): string
-    {
-        if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
-            $uri = $this->getFrontendObject()->absRefPrefix . $uri;
-        }
-        return $uri;
-    }
-
-    /**
-     * Returns true whether an thumbnail can be generated
-     *
-     * @param string $extension File extension
-     * @return boolean
-     */
-    protected function isThumbnailPossible($extension): bool
-    {
-        return GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], strtolower($extension));
-    }
-
-    /**
-     * @return File
-     */
-    protected function getFile(): File
-    {
-        return $this->thumbnailService->getFile();
-    }
-
-    /**
-     * Returns whether the current mode is Frontend
-     *
-     * @return bool
-     */
-    protected function isFrontendMode(): bool
-    {
-        return !Environment::isCli() && ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend();
-    }
-
-    protected function getFrontendObject(): TypoScriptFrontendController
-    {
-        return $GLOBALS['TSFE'];
-    }
+	/**
+	 * @var ThumbnailService
+	 */
+	protected $thumbnailService;
+
+	/**
+	 * Store a Processed File along the processing.
+	 *
+	 * @var ProcessedFile
+	 */
+	protected $processedFile;
+
+	/**
+	 * Define what are the rendering steps for a thumbnail.
+	 */
+	protected array $renderingSteps = [
+		ThumbnailInterface::OUTPUT_URI => 'renderUri',
+		ThumbnailInterface::OUTPUT_IMAGE => 'renderTagImage',
+		ThumbnailInterface::OUTPUT_IMAGE_WRAPPED => 'renderTagAnchor',
+	];
+
+	public function setThumbnailService(ThumbnailService $thumbnailService): AbstractThumbnailProcessor
+	{
+		$this->thumbnailService = $thumbnailService;
+		return $this;
+	}
+
+	/**
+	 * Return what needs to be rendered
+	 */
+	protected function getRenderingSteps(): array
+	{
+		$position = array_search($this->thumbnailService->getOutputType(), array_keys($this->renderingSteps));
+		return array_slice($this->renderingSteps, 0, $position + 1);
+	}
+
+
+	/**
+	 * Render additional attribute for this DOM element.
+	 */
+	protected function renderAttributes(): string
+	{
+		$result = '';
+		$attributes = $this->thumbnailService->getAttributes();
+		if (is_array($attributes)) {
+			foreach ($attributes as $attribute => $value) {
+				$result .= sprintf(
+					'%s="%s" ',
+					htmlspecialchars($attribute),
+					htmlspecialchars($value)
+				);
+			}
+		}
+		return $result;
+	}
+
+	protected function getConfiguration(): array
+	{
+		$configuration = $this->thumbnailService->getConfiguration();
+		if (!$configuration) {
+			$dimension = ImagePresetUtility::getInstance()->preset('image_thumbnail');
+			$configuration = array(
+				'width' => $dimension->getWidth(),
+				'height' => $dimension->getHeight(),
+			);
+		}
+		return $configuration;
+	}
+
+	/**
+	 * Returns a path to an icon given an extension.
+	 *
+	 * @param string $extension File extension
+	 */
+	protected function getIcon($extension): string
+	{
+		$resource = Path::getRelativePath(sprintf('Icons/MimeType/%s.png', $extension));
+
+		// If file is not found, fall back to a default icon
+		if (Path::notExists($resource)) {
+			$resource = Path::getRelativePath('Icons/MissingMimeTypeIcon.png');
+		}
+
+		return $resource;
+	}
+
+	/**
+	 * @param string $uri
+	 */
+	public function prefixUri($uri): string
+	{
+		if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
+			$uri = $this->getFrontendObject()->absRefPrefix . $uri;
+		}
+		return $uri;
+	}
+
+	/**
+	 * Returns true whether an thumbnail can be generated
+	 *
+	 * @param string $extension File extension
+	 * @return boolean
+	 */
+	protected function isThumbnailPossible($extension): bool
+	{
+		return GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], strtolower($extension));
+	}
+
+	/**
+	 * @return File
+	 */
+	protected function getFile(): File
+	{
+		return $this->thumbnailService->getFile();
+	}
+
+	/**
+	 * Returns whether the current mode is Frontend
+	 *
+	 * @return bool
+	 */
+	protected function isFrontendMode(): bool
+	{
+		return !Environment::isCli() && ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend();
+	}
+
+	protected function getFrontendObject(): TypoScriptFrontendController
+	{
+		return $GLOBALS['TSFE'];
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
     public function prefixUri($uri): string
     {
         if ($this->isFrontendMode() && $this->getFrontendObject()->absRefPrefix) {
-            $uri = $this->getFrontendObject()->absRefPrefix . $uri;
+            $uri = $this->getFrontendObject()->absRefPrefix.$uri;
         }
         return $uri;
     }

Classes/Thumbnail/ThumbnailService.php

Indentation +243 added lines, -243 removed lines

@@ -20,247 +20,247 @@
  */
 class ThumbnailService
 {
-    protected array $allowedOutputTypes = [
-        ThumbnailInterface::OUTPUT_IMAGE,
-        ThumbnailInterface::OUTPUT_IMAGE_WRAPPED,
-        ThumbnailInterface::OUTPUT_URI,
-    ];
-
-    /**
-     * Configure the output of the thumbnail service whether it is wrapped or not.
-     * Default output is: ThumbnailInterface::OUTPUT_IMAGE
-     */
-    protected string $outputType = ThumbnailInterface::OUTPUT_IMAGE;
-
-    protected ?File $file = null;
-
-    /**
-     * Define width, height and all sort of attributes to render a thumbnail.
-     * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
-     * @var array
-     */
-    protected array $configuration = [];
-
-    /**
-     * Define width, height and all sort of attributes to render the anchor file
-     * which is wrapping the image
-     *
-     * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
-     * @var array
-     */
-    protected array $configurationWrap = [];
-
-    /**
-     * DOM attributes to add to the image preview.
-     *
-     * @var array
-     */
-    protected array $attributes = [
-        'class' => 'thumbnail',
-    ];
-
-    /**
-     * Define in which window will the thumbnail be opened.
-     * Does only apply if the thumbnail is wrapped (with an anchor).
-     */
-    protected string $target = ThumbnailInterface::TARGET_BLANK;
-
-    /**
-     * URI of the wrapping anchor pointing to the file.
-     * replacing the "?" <a href="?">...</a>
-     * The URI is automatically computed if not set.
-     */
-    protected string $anchorUri = '';
-
-    /**
-     * Whether a time stamp is appended to the image.
-     * Appending the time stamp can prevent caching
-     */
-    protected bool $appendTimeStamp = false;
-
-    /**
-     * Define the processing type for the thumbnail.
-     * As instance for image the default is ProcessedFile::CONTEXT_IMAGECROPSCALEMASK.
-     */
-    protected string $processingType = '';
-
-    public function __construct(File $file = null)
-    {
-        $this->file = $file;
-    }
-
-    /**
-     * Render a thumbnail of a media
-     */
-    public function create(): string
-    {
-        if (!$this->file) {
-            throw new MissingTcaConfigurationException('Missing File object. Forgotten to set a file?', 1355933144);
-        }
-
-        // Default class name
-        $className = FallBackThumbnailProcessor::class;
-        if (File::FILETYPE_IMAGE === $this->file->getType()) {
-            $className = ImageThumbnailProcessor::class;
-        } elseif (File::FILETYPE_AUDIO === $this->file->getType()) {
-            $className = AudioThumbnailProcessor::class;
-        } elseif (File::FILETYPE_VIDEO === $this->file->getType()) {
-            $className = VideoThumbnailProcessor::class;
-        } elseif (File::FILETYPE_APPLICATION === $this->file->getType() || File::FILETYPE_TEXT === $this->file->getType()) {
-            $className = ApplicationThumbnailProcessor::class;
-        }
-
-        /** @var $processorInstance \Fab\Media\Thumbnail\ThumbnailProcessorInterface */
-        $processorInstance = GeneralUtility::makeInstance($className);
-
-        $thumbnail = '';
-        if ($this->file->exists()) {
-            $thumbnail = $processorInstance->setThumbnailService($this)->create();
-        } else {
-            $logger = Logger::getInstance($this);
-            $logger->warning(sprintf('Resource not found for File uid "%s" at %s', $this->file->getUid(), $this->file->getIdentifier()));
-        }
-
-        return $thumbnail;
-    }
-
-    /**
-     * @return array
-     */
-    public function getConfigurationWrap(): array
-    {
-        return $this->configurationWrap;
-    }
-
-    /**
-     * @param array $configurationWrap
-     * @return $this
-     */
-    public function setConfigurationWrap($configurationWrap): ThumbnailService
-    {
-        $this->configurationWrap = $configurationWrap;
-        return $this;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getFile()
-    {
-        return $this->file;
-    }
-
-    /**
-     * @return array
-     */
-    public function getConfiguration(): array
-    {
-        return $this->configuration;
-    }
-
-    /**
-     * @param array|ThumbnailConfiguration $configuration
-     * @return $this
-     */
-    public function setConfiguration($configuration): ThumbnailService
-    {
-        if ($configuration instanceof ThumbnailConfiguration) {
-            $configurationObject = $configuration;
-            $configuration = [];
-
-            if ($configurationObject->getWidth() > 0) {
-                $configuration['width'] = $configurationObject->getWidth();
-            }
-
-            if ($configurationObject->getHeight() > 0) {
-                $configuration['height'] = $configurationObject->getHeight();
-            }
-
-            if ($configurationObject->getStyle()) {
-                $this->attributes['style'] = $configurationObject->getStyle();
-            }
-
-            if ($configurationObject->getClassName()) {
-                $this->attributes['class'] = $configurationObject->getClassName();
-            }
-        }
-
-        $this->configuration = $configuration;
-        return $this;
-    }
-
-    public function getAttributes(): array
-    {
-        return $this->attributes;
-    }
-
-    public function setAttributes(array $attributes): ThumbnailService
-    {
-        $this->attributes = $attributes;
-        return $this;
-    }
-
-    public function getOutputType(): string
-    {
-        return $this->outputType;
-    }
-
-    public function setOutputType(string $outputType): ThumbnailService
-    {
-        if (!in_array($outputType, $this->allowedOutputTypes)) {
-            throw new InvalidKeyInArrayException(
-                sprintf('Output type "%s" is not allowed', $outputType),
-                1373020076
-            );
-        }
-        $this->outputType = $outputType;
-        return $this;
-    }
-
-    public function getTarget(): string
-    {
-        return $this->target;
-    }
-
-    public function setTarget(string $target): ThumbnailService
-    {
-        $this->target = $target;
-        return $this;
-    }
-
-    public function getAnchorUri(): string
-    {
-        return $this->anchorUri;
-    }
-
-    public function setAnchorUri(string $anchorUri): ThumbnailService
-    {
-        $this->anchorUri = $anchorUri;
-        return $this;
-    }
-
-    public function getAppendTimeStamp(): bool
-    {
-        return $this->appendTimeStamp;
-    }
-
-    /**
-     * @param boolean $appendTimeStamp
-     */
-    public function setAppendTimeStamp($appendTimeStamp): ThumbnailService
-    {
-        $this->appendTimeStamp = (bool)$appendTimeStamp;
-        return $this;
-    }
-
-    public function getProcessingType(): string
-    {
-        return $this->processingType;
-    }
-
-    public function setProcessingType(string $processingType): ThumbnailService
-    {
-        $this->processingType = $processingType;
-        return $this;
-    }
+	protected array $allowedOutputTypes = [
+		ThumbnailInterface::OUTPUT_IMAGE,
+		ThumbnailInterface::OUTPUT_IMAGE_WRAPPED,
+		ThumbnailInterface::OUTPUT_URI,
+	];
+
+	/**
+	 * Configure the output of the thumbnail service whether it is wrapped or not.
+	 * Default output is: ThumbnailInterface::OUTPUT_IMAGE
+	 */
+	protected string $outputType = ThumbnailInterface::OUTPUT_IMAGE;
+
+	protected ?File $file = null;
+
+	/**
+	 * Define width, height and all sort of attributes to render a thumbnail.
+	 * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
+	 * @var array
+	 */
+	protected array $configuration = [];
+
+	/**
+	 * Define width, height and all sort of attributes to render the anchor file
+	 * which is wrapping the image
+	 *
+	 * @see TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::Image
+	 * @var array
+	 */
+	protected array $configurationWrap = [];
+
+	/**
+	 * DOM attributes to add to the image preview.
+	 *
+	 * @var array
+	 */
+	protected array $attributes = [
+		'class' => 'thumbnail',
+	];
+
+	/**
+	 * Define in which window will the thumbnail be opened.
+	 * Does only apply if the thumbnail is wrapped (with an anchor).
+	 */
+	protected string $target = ThumbnailInterface::TARGET_BLANK;
+
+	/**
+	 * URI of the wrapping anchor pointing to the file.
+	 * replacing the "?" <a href="?">...</a>
+	 * The URI is automatically computed if not set.
+	 */
+	protected string $anchorUri = '';
+
+	/**
+	 * Whether a time stamp is appended to the image.
+	 * Appending the time stamp can prevent caching
+	 */
+	protected bool $appendTimeStamp = false;
+
+	/**
+	 * Define the processing type for the thumbnail.
+	 * As instance for image the default is ProcessedFile::CONTEXT_IMAGECROPSCALEMASK.
+	 */
+	protected string $processingType = '';
+
+	public function __construct(File $file = null)
+	{
+		$this->file = $file;
+	}
+
+	/**
+	 * Render a thumbnail of a media
+	 */
+	public function create(): string
+	{
+		if (!$this->file) {
+			throw new MissingTcaConfigurationException('Missing File object. Forgotten to set a file?', 1355933144);
+		}
+
+		// Default class name
+		$className = FallBackThumbnailProcessor::class;
+		if (File::FILETYPE_IMAGE === $this->file->getType()) {
+			$className = ImageThumbnailProcessor::class;
+		} elseif (File::FILETYPE_AUDIO === $this->file->getType()) {
+			$className = AudioThumbnailProcessor::class;
+		} elseif (File::FILETYPE_VIDEO === $this->file->getType()) {
+			$className = VideoThumbnailProcessor::class;
+		} elseif (File::FILETYPE_APPLICATION === $this->file->getType() || File::FILETYPE_TEXT === $this->file->getType()) {
+			$className = ApplicationThumbnailProcessor::class;
+		}
+
+		/** @var $processorInstance \Fab\Media\Thumbnail\ThumbnailProcessorInterface */
+		$processorInstance = GeneralUtility::makeInstance($className);
+
+		$thumbnail = '';
+		if ($this->file->exists()) {
+			$thumbnail = $processorInstance->setThumbnailService($this)->create();
+		} else {
+			$logger = Logger::getInstance($this);
+			$logger->warning(sprintf('Resource not found for File uid "%s" at %s', $this->file->getUid(), $this->file->getIdentifier()));
+		}
+
+		return $thumbnail;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getConfigurationWrap(): array
+	{
+		return $this->configurationWrap;
+	}
+
+	/**
+	 * @param array $configurationWrap
+	 * @return $this
+	 */
+	public function setConfigurationWrap($configurationWrap): ThumbnailService
+	{
+		$this->configurationWrap = $configurationWrap;
+		return $this;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getFile()
+	{
+		return $this->file;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getConfiguration(): array
+	{
+		return $this->configuration;
+	}
+
+	/**
+	 * @param array|ThumbnailConfiguration $configuration
+	 * @return $this
+	 */
+	public function setConfiguration($configuration): ThumbnailService
+	{
+		if ($configuration instanceof ThumbnailConfiguration) {
+			$configurationObject = $configuration;
+			$configuration = [];
+
+			if ($configurationObject->getWidth() > 0) {
+				$configuration['width'] = $configurationObject->getWidth();
+			}
+
+			if ($configurationObject->getHeight() > 0) {
+				$configuration['height'] = $configurationObject->getHeight();
+			}
+
+			if ($configurationObject->getStyle()) {
+				$this->attributes['style'] = $configurationObject->getStyle();
+			}
+
+			if ($configurationObject->getClassName()) {
+				$this->attributes['class'] = $configurationObject->getClassName();
+			}
+		}
+
+		$this->configuration = $configuration;
+		return $this;
+	}
+
+	public function getAttributes(): array
+	{
+		return $this->attributes;
+	}
+
+	public function setAttributes(array $attributes): ThumbnailService
+	{
+		$this->attributes = $attributes;
+		return $this;
+	}
+
+	public function getOutputType(): string
+	{
+		return $this->outputType;
+	}
+
+	public function setOutputType(string $outputType): ThumbnailService
+	{
+		if (!in_array($outputType, $this->allowedOutputTypes)) {
+			throw new InvalidKeyInArrayException(
+				sprintf('Output type "%s" is not allowed', $outputType),
+				1373020076
+			);
+		}
+		$this->outputType = $outputType;
+		return $this;
+	}
+
+	public function getTarget(): string
+	{
+		return $this->target;
+	}
+
+	public function setTarget(string $target): ThumbnailService
+	{
+		$this->target = $target;
+		return $this;
+	}
+
+	public function getAnchorUri(): string
+	{
+		return $this->anchorUri;
+	}
+
+	public function setAnchorUri(string $anchorUri): ThumbnailService
+	{
+		$this->anchorUri = $anchorUri;
+		return $this;
+	}
+
+	public function getAppendTimeStamp(): bool
+	{
+		return $this->appendTimeStamp;
+	}
+
+	/**
+	 * @param boolean $appendTimeStamp
+	 */
+	public function setAppendTimeStamp($appendTimeStamp): ThumbnailService
+	{
+		$this->appendTimeStamp = (bool)$appendTimeStamp;
+		return $this;
+	}
+
+	public function getProcessingType(): string
+	{
+		return $this->processingType;
+	}
+
+	public function setProcessingType(string $processingType): ThumbnailService
+	{
+		$this->processingType = $processingType;
+		return $this;
+	}
 }

Classes/Thumbnail/ThumbnailProcessorInterface.php

Indentation +31 added lines, -31 removed lines

@@ -14,39 +14,39 @@
  */
 interface ThumbnailProcessorInterface
 {
-    /**
-     * @param ThumbnailService $thumbnailService
-     * @return $this
-     */
-    public function setThumbnailService(ThumbnailService $thumbnailService);
+	/**
+	 * @param ThumbnailService $thumbnailService
+	 * @return $this
+	 */
+	public function setThumbnailService(ThumbnailService $thumbnailService);
 
-    /**
-     * Render a thumbnail.
-     *
-     * @return string
-     */
-    public function create();
+	/**
+	 * Render a thumbnail.
+	 *
+	 * @return string
+	 */
+	public function create();
 
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     */
-    public function renderUri();
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 */
+	public function renderUri();
 
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result);
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result);
 
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result);
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result);
 }

Classes/Thumbnail/VideoThumbnailProcessor.php

Indentation +80 added lines, -80 removed lines

@@ -17,93 +17,93 @@
  */
 class VideoThumbnailProcessor extends AbstractThumbnailProcessor
 {
-    /**
-     * Render a thumbnail of a resource of type video.
-     *
-     * @return string
-     */
-    public function create()
-    {
-        $steps = $this->getRenderingSteps();
+	/**
+	 * Render a thumbnail of a resource of type video.
+	 *
+	 * @return string
+	 */
+	public function create()
+	{
+		$steps = $this->getRenderingSteps();
 
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
 
-        return $result;
-    }
+		return $result;
+	}
 
-    /**
-     * Render the URI of the thumbnail.
-     *
-     * @return string
-     */
-    public function renderUri()
-    {
-        $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
-        if (!file_exists($fileNameAndPath)) {
-            $relativePath = 'Icons/UnknownMimeType.png';
-        }
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 * @return string
+	 */
+	public function renderUri()
+	{
+		$relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
+		$fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+		if (!file_exists($fileNameAndPath)) {
+			$relativePath = 'Icons/UnknownMimeType.png';
+		}
 
-        $uri = Path::getRelativePath($relativePath);
-        return $this->prefixUri($uri);
-    }
+		$uri = Path::getRelativePath($relativePath);
+		return $this->prefixUri($uri);
+	}
 
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagImage($result)
-    {
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagImage($result)
+	{
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
 
-        return sprintf(
-            '<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
 
-    /**
-     * Compute and return the title of the file.
-     *
-     * @return string
-     */
-    protected function getTitle()
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (!$result) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
+	/**
+	 * Compute and return the title of the file.
+	 *
+	 * @return string
+	 */
+	protected function getTitle()
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (!$result) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
 
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     * @return string
-     */
-    public function renderTagAnchor($result)
-    {
-        $file = $this->getFile();
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 * @return string
+	 */
+	public function renderTagAnchor($result)
+	{
+		$file = $this->getFile();
 
-        return sprintf(
-            '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
-            $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
-            $this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
-            $this->thumbnailService->getTarget(),
-            $file->getUid(),
-            $result
-        );
-    }
+		return sprintf(
+			'<a href="%s%s" target="%s" data-uid="%s">%s</a>',
+			$this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
+			$this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
+			$this->thumbnailService->getTarget(),
+			$file->getUid(),
+			$result
+		);
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
     public function renderUri()
     {
         $relativePath = sprintf('Icons/MimeType/%s.png', $this->getFile()->getProperty('extension'));
-        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/' . $relativePath);
+        $fileNameAndPath = GeneralUtility::getFileAbsFileName('EXT:media/Resources/Public/'.$relativePath);
         if (!file_exists($fileNameAndPath)) {
             $relativePath = 'Icons/UnknownMimeType.png';
         }
@@ -66,7 +66,7 @@ 
         return sprintf(
             '<img src="%s%s" title="%s" alt="%s" %s/>',
             $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getFile()->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator.$this->getFile()->getProperty('tstamp') : '',
             $this->getTitle(),
             $this->getTitle(),
             $this->renderAttributes()
@@ -100,7 +100,7 @@ 
         return sprintf(
             '<a href="%s%s" target="%s" data-uid="%s">%s</a>',
             $this->thumbnailService->getAnchorUri() ? $this->thumbnailService->getAnchorUri() : $file->getPublicUrl(true),
-            $this->thumbnailService->getAppendTimeStamp() ? '?' . $file->getProperty('tstamp') : '',
+            $this->thumbnailService->getAppendTimeStamp() ? '?'.$file->getProperty('tstamp') : '',
             $this->thumbnailService->getTarget(),
             $file->getUid(),
             $result

Classes/Thumbnail/ThumbnailGenerator.php

Indentation +178 added lines, -178 removed lines

@@ -22,182 +22,182 @@
  */
 class ThumbnailGenerator
 {
-    protected int $numberOfTraversedFiles = 0;
-
-    protected int $numberOfProcessedFiles = 0;
-
-    protected int $numberOfMissingFiles = 0;
-
-    protected array $configuration = [];
-
-    protected ?ResourceStorage $storage = null;
-
-    protected ?Selection $selection = null;
-
-    protected array $resultSet = [];
-
-    protected array $newProcessedFileIdentifiers = [];
-
-    protected int $lastInsertedProcessedFile = 0;
-
-    protected int $limit = 0;
-
-    protected int $offset = 0;
-
-    public function generate(int $limit = 0, int $offset = 0): void
-    {
-        $this->limit = $limit;
-        $this->offset = $offset;
-
-        // Compute a possible limit and offset for the query.
-        $rows = $this->getDataService()
-            ->getRecords(
-                'sys_file',
-                [
-                    'storage' => $this->storage->getUid()
-                ],
-                $limit,
-                $offset
-            );
-
-        foreach ($rows as $row) {
-            $file = $this->getResourceFactory()->getFileObject($row['uid'], $row);
-
-            if ($file->exists()) {
-                $thumbnailUri = $this->getThumbnailService($file)
-                    ->setOutputType(ThumbnailInterface::OUTPUT_URI)
-                    ->setConfiguration($this->configuration)
-                    ->create();
-
-                $this->resultSet[$file->getUid()] = [
-                    'fileUid' => $file->getUid(),
-                    'fileIdentifier' => $file->getIdentifier(),
-                    'thumbnailUri' => strpos($thumbnailUri, '_processed_') > 0 ? $thumbnailUri : '', // only returns the thumbnail uri if a processed file has been created.
-                ];
-
-                if ($this->isNewProcessedFile()) {
-                    $this->incrementNumberOfProcessedFiles();
-                    $this->newProcessedFileIdentifiers[$file->getUid()] = $this->lastInsertedProcessedFile;
-                }
-
-                $this->incrementNumberOfTraversedFiles();
-            } else {
-                $this->incrementNumberOfMissingFiles();
-            }
-        }
-    }
-
-    protected function isNewProcessedFile(): bool
-    {
-        $isNewProcessedFile = false;
-
-        $tableName = 'sys_file_processedfile';
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $databaseConnection = $connectionPool->getConnectionForTable($tableName);
-        $lastInsertedId = (int)$databaseConnection->lastInsertId($tableName);
-
-        if ($lastInsertedId > 0 && $lastInsertedId !== $this->lastInsertedProcessedFile) {
-            $this->lastInsertedProcessedFile = $lastInsertedId;
-            $isNewProcessedFile = true;
-        }
-        return $isNewProcessedFile;
-    }
-
-    public function getNumberOfTraversedFiles(): int
-    {
-        return $this->numberOfTraversedFiles;
-    }
-
-    public function getNumberOfProcessedFiles(): int
-    {
-        return $this->numberOfProcessedFiles;
-    }
-
-    public function getTotalNumberOfFiles(): int
-    {
-        return $this->getDataService()
-            ->count(
-                'sys_file',
-                [
-                    'storage' => $this->storage->getUid()
-                ],
-                $this->limit,
-                $this->offset
-            );
-    }
-
-    /**
-     * @return array
-     */
-    public function getResultSet()
-    {
-        return $this->resultSet;
-    }
-
-    /**
-     * @return array
-     */
-    public function getNewProcessedFileIdentifiers()
-    {
-        return $this->newProcessedFileIdentifiers;
-    }
-
-    /**
-     * @return int
-     */
-    public function getNumberOfMissingFiles()
-    {
-        return $this->numberOfMissingFiles;
-    }
-
-    public function setStorage(ResourceStorage $storage): ThumbnailGenerator
-    {
-        $this->storage = $storage;
-        return $this;
-    }
-
-    /**
-     * @param Selection $selection
-     */
-    public function setSelection($selection): ThumbnailGenerator
-    {
-        $this->selection = $selection;
-        return $this;
-    }
-
-    public function setConfiguration(array $configuration): ThumbnailGenerator
-    {
-        $this->configuration = $configuration;
-        return $this;
-    }
-
-    protected function getThumbnailService(File $file): ThumbnailService
-    {
-        return GeneralUtility::makeInstance(ThumbnailService::class, $file);
-    }
-
-    protected function incrementNumberOfTraversedFiles()
-    {
-        $this->numberOfTraversedFiles++;
-    }
-
-    protected function incrementNumberOfMissingFiles()
-    {
-        $this->numberOfMissingFiles++;
-    }
-
-    protected function incrementNumberOfProcessedFiles()
-    {
-        $this->numberOfProcessedFiles++;
-    }
-
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	protected int $numberOfTraversedFiles = 0;
+
+	protected int $numberOfProcessedFiles = 0;
+
+	protected int $numberOfMissingFiles = 0;
+
+	protected array $configuration = [];
+
+	protected ?ResourceStorage $storage = null;
+
+	protected ?Selection $selection = null;
+
+	protected array $resultSet = [];
+
+	protected array $newProcessedFileIdentifiers = [];
+
+	protected int $lastInsertedProcessedFile = 0;
+
+	protected int $limit = 0;
+
+	protected int $offset = 0;
+
+	public function generate(int $limit = 0, int $offset = 0): void
+	{
+		$this->limit = $limit;
+		$this->offset = $offset;
+
+		// Compute a possible limit and offset for the query.
+		$rows = $this->getDataService()
+			->getRecords(
+				'sys_file',
+				[
+					'storage' => $this->storage->getUid()
+				],
+				$limit,
+				$offset
+			);
+
+		foreach ($rows as $row) {
+			$file = $this->getResourceFactory()->getFileObject($row['uid'], $row);
+
+			if ($file->exists()) {
+				$thumbnailUri = $this->getThumbnailService($file)
+					->setOutputType(ThumbnailInterface::OUTPUT_URI)
+					->setConfiguration($this->configuration)
+					->create();
+
+				$this->resultSet[$file->getUid()] = [
+					'fileUid' => $file->getUid(),
+					'fileIdentifier' => $file->getIdentifier(),
+					'thumbnailUri' => strpos($thumbnailUri, '_processed_') > 0 ? $thumbnailUri : '', // only returns the thumbnail uri if a processed file has been created.
+				];
+
+				if ($this->isNewProcessedFile()) {
+					$this->incrementNumberOfProcessedFiles();
+					$this->newProcessedFileIdentifiers[$file->getUid()] = $this->lastInsertedProcessedFile;
+				}
+
+				$this->incrementNumberOfTraversedFiles();
+			} else {
+				$this->incrementNumberOfMissingFiles();
+			}
+		}
+	}
+
+	protected function isNewProcessedFile(): bool
+	{
+		$isNewProcessedFile = false;
+
+		$tableName = 'sys_file_processedfile';
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$databaseConnection = $connectionPool->getConnectionForTable($tableName);
+		$lastInsertedId = (int)$databaseConnection->lastInsertId($tableName);
+
+		if ($lastInsertedId > 0 && $lastInsertedId !== $this->lastInsertedProcessedFile) {
+			$this->lastInsertedProcessedFile = $lastInsertedId;
+			$isNewProcessedFile = true;
+		}
+		return $isNewProcessedFile;
+	}
+
+	public function getNumberOfTraversedFiles(): int
+	{
+		return $this->numberOfTraversedFiles;
+	}
+
+	public function getNumberOfProcessedFiles(): int
+	{
+		return $this->numberOfProcessedFiles;
+	}
+
+	public function getTotalNumberOfFiles(): int
+	{
+		return $this->getDataService()
+			->count(
+				'sys_file',
+				[
+					'storage' => $this->storage->getUid()
+				],
+				$this->limit,
+				$this->offset
+			);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getResultSet()
+	{
+		return $this->resultSet;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getNewProcessedFileIdentifiers()
+	{
+		return $this->newProcessedFileIdentifiers;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getNumberOfMissingFiles()
+	{
+		return $this->numberOfMissingFiles;
+	}
+
+	public function setStorage(ResourceStorage $storage): ThumbnailGenerator
+	{
+		$this->storage = $storage;
+		return $this;
+	}
+
+	/**
+	 * @param Selection $selection
+	 */
+	public function setSelection($selection): ThumbnailGenerator
+	{
+		$this->selection = $selection;
+		return $this;
+	}
+
+	public function setConfiguration(array $configuration): ThumbnailGenerator
+	{
+		$this->configuration = $configuration;
+		return $this;
+	}
+
+	protected function getThumbnailService(File $file): ThumbnailService
+	{
+		return GeneralUtility::makeInstance(ThumbnailService::class, $file);
+	}
+
+	protected function incrementNumberOfTraversedFiles()
+	{
+		$this->numberOfTraversedFiles++;
+	}
+
+	protected function incrementNumberOfMissingFiles()
+	{
+		$this->numberOfMissingFiles++;
+	}
+
+	protected function incrementNumberOfProcessedFiles()
+	{
+		$this->numberOfProcessedFiles++;
+	}
+
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Thumbnail/ApplicationThumbnailProcessor.php

Indentation +122 added lines, -122 removed lines

@@ -18,126 +18,126 @@
  */
 class ApplicationThumbnailProcessor extends AbstractThumbnailProcessor
 {
-    /**
-     * Render a thumbnail of a resource of type application.
-     *
-     */
-    public function create(): string
-    {
-        $steps = $this->getRenderingSteps();
-
-        $result = '';
-        while ($step = array_shift($steps)) {
-            $result = $this->$step($result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Render the URI of the thumbnail.
-     *
-     */
-    public function renderUri(): string
-    {
-        if ($this->isThumbnailPossible($this->getFile()->getExtension())) {
-            $this->processedFile = $this->getFile()->process($this->getProcessingType(), $this->getConfiguration());
-            $uri = $this->processedFile->getPublicUrl(true);
-
-            // Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
-            if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
-                $this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
-            }
-        } else {
-            $uri = $this->getIcon($this->getFile()->getExtension());
-        }
-        return $this->prefixUri($uri);
-    }
-
-    /**
-     * Render the tag image which is the main one for a thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagImage($result): string
-    {
-        // Variable $result corresponds to an URL in this case.
-        // Analyse the URL and compute the adequate separator between arguments.
-        $parameterSeparator = strpos($result, '?') === false ? '?' : '&';
-
-        return sprintf(
-            '<img src="%s%s" title="%s" alt="%s" %s/>',
-            $result,
-            $this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
-            $this->getTitle(),
-            $this->getTitle(),
-            $this->renderAttributes()
-        );
-    }
-
-    /**
-     * Compute and return the time stamp.
-     *
-     * @return int
-     */
-    protected function getTimeStamp()
-    {
-        $result = $this->getFile()->getProperty('tstamp');
-        if ($this->processedFile) {
-            $result = $this->processedFile->getProperty('tstamp');
-        }
-        return $result;
-    }
-
-    /**
-     * Compute and return the title of the file.
-     */
-    protected function getTitle(): string
-    {
-        $result = $this->getFile()->getProperty('title');
-        if (empty($result)) {
-            $result = $this->getFile()->getName();
-        }
-        return htmlspecialchars($result);
-    }
-
-    /**
-     * Render a wrapping anchor around the thumbnail.
-     *
-     * @param string $result
-     */
-    public function renderTagAnchor($result): string
-    {
-        $uri = $this->thumbnailService->getAnchorUri();
-        if (!$uri) {
-            $uri = $this->getUri();
-        }
-
-        return sprintf(
-            '<a href="%s" target="_blank" data-uid="%s">%s</a>',
-            $uri,
-            $this->getFile()->getUid(),
-            $result
-        );
-    }
-
-    protected function getUri(): string
-    {
-        $urlParameters = [
-            MediaModule::getParameterPrefix() => [
-                'controller' => 'Asset',
-                'action' => 'download',
-                'file' => $this->getFile()->getUid(),
-            ],
-        ];
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
-
-    public function getProcessingType(): string
-    {
-        if (!$this->thumbnailService->getProcessingType()) {
-            return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
-        }
-        return $this->thumbnailService->getProcessingType();
-    }
+	/**
+	 * Render a thumbnail of a resource of type application.
+	 *
+	 */
+	public function create(): string
+	{
+		$steps = $this->getRenderingSteps();
+
+		$result = '';
+		while ($step = array_shift($steps)) {
+			$result = $this->$step($result);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Render the URI of the thumbnail.
+	 *
+	 */
+	public function renderUri(): string
+	{
+		if ($this->isThumbnailPossible($this->getFile()->getExtension())) {
+			$this->processedFile = $this->getFile()->process($this->getProcessingType(), $this->getConfiguration());
+			$uri = $this->processedFile->getPublicUrl(true);
+
+			// Update time stamp of processed image at this stage. This is needed for the browser to get new version of the thumbnail.
+			if ($this->processedFile->getProperty('originalfilesha1') !== $this->getFile()->getProperty('sha1')) {
+				$this->processedFile->updateProperties(array('tstamp' => $this->getFile()->getProperty('tstamp')));
+			}
+		} else {
+			$uri = $this->getIcon($this->getFile()->getExtension());
+		}
+		return $this->prefixUri($uri);
+	}
+
+	/**
+	 * Render the tag image which is the main one for a thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagImage($result): string
+	{
+		// Variable $result corresponds to an URL in this case.
+		// Analyse the URL and compute the adequate separator between arguments.
+		$parameterSeparator = strpos($result, '?') === false ? '?' : '&';
+
+		return sprintf(
+			'<img src="%s%s" title="%s" alt="%s" %s/>',
+			$result,
+			$this->thumbnailService->getAppendTimeStamp() ? $parameterSeparator . $this->getTimeStamp() : '',
+			$this->getTitle(),
+			$this->getTitle(),
+			$this->renderAttributes()
+		);
+	}
+
+	/**
+	 * Compute and return the time stamp.
+	 *
+	 * @return int
+	 */
+	protected function getTimeStamp()
+	{
+		$result = $this->getFile()->getProperty('tstamp');
+		if ($this->processedFile) {
+			$result = $this->processedFile->getProperty('tstamp');
+		}
+		return $result;
+	}
+
+	/**
+	 * Compute and return the title of the file.
+	 */
+	protected function getTitle(): string
+	{
+		$result = $this->getFile()->getProperty('title');
+		if (empty($result)) {
+			$result = $this->getFile()->getName();
+		}
+		return htmlspecialchars($result);
+	}
+
+	/**
+	 * Render a wrapping anchor around the thumbnail.
+	 *
+	 * @param string $result
+	 */
+	public function renderTagAnchor($result): string
+	{
+		$uri = $this->thumbnailService->getAnchorUri();
+		if (!$uri) {
+			$uri = $this->getUri();
+		}
+
+		return sprintf(
+			'<a href="%s" target="_blank" data-uid="%s">%s</a>',
+			$uri,
+			$this->getFile()->getUid(),
+			$result
+		);
+	}
+
+	protected function getUri(): string
+	{
+		$urlParameters = [
+			MediaModule::getParameterPrefix() => [
+				'controller' => 'Asset',
+				'action' => 'download',
+				'file' => $this->getFile()->getUid(),
+			],
+		];
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
+
+	public function getProcessingType(): string
+	{
+		if (!$this->thumbnailService->getProcessingType()) {
+			return ProcessedFile::CONTEXT_IMAGECROPSCALEMASK;
+		}
+		return $this->thumbnailService->getProcessingType();
+	}
 }

Classes/Thumbnail/ThumbnailConfiguration.php

Indentation +80 added lines, -80 removed lines

@@ -15,95 +15,95 @@
  */
 class ThumbnailConfiguration
 {
-    /**
-     * @var int
-     */
-    protected $width = 0;
+	/**
+	 * @var int
+	 */
+	protected $width = 0;
 
-    /**
-     * @var int
-     */
-    protected $height = 0;
+	/**
+	 * @var int
+	 */
+	protected $height = 0;
 
-    /**
-     * @var string
-     */
-    protected $style = '';
+	/**
+	 * @var string
+	 */
+	protected $style = '';
 
-    /**
-     * @var string
-     */
-    protected $className = '';
+	/**
+	 * @var string
+	 */
+	protected $className = '';
 
-    /**
-     * @return int
-     */
-    public function getWidth()
-    {
-        return $this->width;
-    }
+	/**
+	 * @return int
+	 */
+	public function getWidth()
+	{
+		return $this->width;
+	}
 
-    /**
-     * @param int $width
-     * @return $this
-     */
-    public function setWidth($width)
-    {
-        $this->width = $width;
-        return $this;
-    }
+	/**
+	 * @param int $width
+	 * @return $this
+	 */
+	public function setWidth($width)
+	{
+		$this->width = $width;
+		return $this;
+	}
 
-    /**
-     * @return int
-     */
-    public function getHeight()
-    {
-        return $this->height;
-    }
+	/**
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		return $this->height;
+	}
 
-    /**
-     * @param int $height
-     * @return $this
-     */
-    public function setHeight($height)
-    {
-        $this->height = $height;
-        return $this;
-    }
+	/**
+	 * @param int $height
+	 * @return $this
+	 */
+	public function setHeight($height)
+	{
+		$this->height = $height;
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    public function getStyle()
-    {
-        return $this->style;
-    }
+	/**
+	 * @return string
+	 */
+	public function getStyle()
+	{
+		return $this->style;
+	}
 
-    /**
-     * @param string $style
-     * @return $this
-     */
-    public function setStyle($style)
-    {
-        $this->style = $style;
-        return $this;
-    }
+	/**
+	 * @param string $style
+	 * @return $this
+	 */
+	public function setStyle($style)
+	{
+		$this->style = $style;
+		return $this;
+	}
 
-    /**
-     * @return string
-     */
-    public function getClassName()
-    {
-        return $this->className;
-    }
+	/**
+	 * @return string
+	 */
+	public function getClassName()
+	{
+		return $this->className;
+	}
 
-    /**
-     * @param string $className
-     * @return $this
-     */
-    public function setClassName($className)
-    {
-        $this->className = $className;
-        return $this;
-    }
+	/**
+	 * @param string $className
+	 * @return $this
+	 */
+	public function setClassName($className)
+	{
+		$this->className = $className;
+		return $this;
+	}
 }