[FEATURE] So far imageopt was forcing all images to be resized on fronted by default. Right now its configurable in Typoscript.

Author: kszymukowicz

Classes/Utility/FrontendProcessingUtility.php

@@ -0,0 +1,44 @@
+<?php
+
+/***************************************************************
+ * Copyright notice
+ *
+ * All rights reserved
+ *
+ * This script is part of the TYPO3 project. The TYPO3 project is
+ * free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * The GNU General Public License can be found at
+ * http://www.gnu.org/copyleft/gpl.html.
+ *
+ * This script is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
+
+namespace SourceBroker\Imageopt\Utility;
+
+/**
+ * Manage temporary files
+ */
+class FrontendProcessingUtility
+{
+ public static function isAllowedToForceFrontendImageProcessing($filePath)
+ {
+ return !empty($GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_imageopt.']['imageProcessing.']['force'])
+ && (empty($GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_imageopt.']['imageProcessing.']['exclusion.']['regexp'])
+ || (
+ !empty($GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_imageopt.']['imageProcessing.']['exclusion.']['regexp'])
+ &&
+ !preg_match($GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_imageopt.']['imageProcessing.']['exclusion.']['regexp'],
+ $filePath)
+ )
+ );
+ }
+}

Classes/Xclass/ContentObjectRenderer.php

@@ -24,24 +24,34 @@
 
 namespace SourceBroker\Imageopt\Xclass;
 
+use SourceBroker\Imageopt\Utility\FrontendProcessingUtility;
+use TYPO3\CMS\Core\Resource\File;
+use TYPO3\CMS\Core\Resource\FileReference;
+
 class ContentObjectRenderer extends \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer
 {
-
  /**
- * Xclassed because when the parameters ($fileArray['params.']) are changed the hash is changed then we force processed files
+ *  TypoScript processed images
  *
- * @param string|File|FileReference $file A "imgResource" TypoScript data type. Either a TypoScript file resource, a file or a file reference object or the string GIFBUILDER. See description above.
+ * 5 = IMAGE
+ * 5 {
+ * file = fileadmin/img.jpg
+ * file.width = 20
+ * }
+ *
+ * @param string |File|FileReference $file A "imgResource" TypoScript data type. Either a TypoScript file resource, a file or a file reference object or the string GIFBUILDER. See description above.
  * @param array $fileArray TypoScript properties for the imgResource type
  * @return array|NULL Returns info-array
  */
  public function getImgResource($file, $fileArray)
  {
- $paramsValue = isset($fileArray['params.']) ? $this->stdWrap($fileArray['params'],
- $fileArray['params.']) : $fileArray['params'];
- unset($fileArray['params.']);
- // Make $fileArray['params'] at least one space to count that towards hash in order to make TYPO3 to process image even if it was not processed without this.
- $fileArray['params'] = $paramsValue . ' ';
-
+ if (FrontendProcessingUtility::isAllowedToForceFrontendImageProcessing($file)) {
+ $paramsValue = isset($fileArray['params.']) ? $this->stdWrap($fileArray['params'],
+ $fileArray['params.']) : $fileArray['params'];
+ unset($fileArray['params.']);
+ // Make $fileArray['params'] at least one space to count that towards hash in order to make TYPO3 to process image even if it would not be processed without this.
+ $fileArray['params'] = $paramsValue . ' ';
+ }
  return parent::getImgResource($file, $fileArray);
  }
 }

Classes/Xclass/FileProcessingService.php

@@ -24,16 +24,13 @@
 
 namespace SourceBroker\Imageopt\Xclass;
 
+use SourceBroker\Imageopt\Utility\FrontendProcessingUtility;
 use TYPO3\CMS\Core\Resource;
-use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 class FileProcessingService extends \TYPO3\CMS\Core\Resource\Service\FileProcessingService
 {
-
  /**
- *
- * Xclassed because when the $configuration['additionalParameters'] is changed the hash is changed
- * and we force to process file even if regulary TYPO3 would use original.
+ * Fluid processed images
  *
  * @param Resource\FileInterface $fileObject The file object
  * @param Resource\ResourceStorage $targetStorage The storage to store the processed file in
@@ -50,30 +47,10 @@ public function processFile(
  $taskType,
  $configuration
  ) {
- /** @var $processedFileRepository Resource\ProcessedFileRepository */
- $processedFileRepository = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\ProcessedFileRepository::class);
-
- // LOCC add neutral additionalParameters that will make the image to be processed even if not needed
- $configuration['additionalParameters'] = 'MUST_RECREATE';
-
- $processedFile = $processedFileRepository->findOneByOriginalFileAndTaskTypeAndConfiguration($fileObject,
- $taskType, $configuration);
-
- // set the storage of the processed file
- // Pre-process the file
-
- $this->emitPreFileProcessSignal($processedFile, $fileObject, $taskType, $configuration);
-
- // Only handle the file if it is not processed yet
- // (maybe modified or already processed by a signal)
- // or (in case of preview images) already in the DB/in the processing folder
- if (!$processedFile->isProcessed()) {
- $this->process($processedFile, $targetStorage);
+ if (FrontendProcessingUtility::isAllowedToForceFrontendImageProcessing($fileObject->getPublicUrl())) {
+ // Make additionalParameters at least one space to count that towards hash in order to make TYPO3 to process image even if it would not be processed without this.
+ $configuration['additionalParameters'] = ' ';
  }
-
- // Post-process (enrich) the file
- $this->emitPostFileProcessSignal($processedFile, $fileObject, $taskType, $configuration);
-
- return $processedFile;
+ return parent::processFile($fileObject, $targetStorage, $taskType, $configuration);
  }
 }

Classes/Xclass/GifBuilder.php

@@ -16,9 +16,6 @@
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']['TYPO3\\CMS\\Core\\Resource\\Service\\FileProcessingService'] = [
  'className' => 'SourceBroker\\Imageopt\\Xclass\\FileProcessingService'
 ];
-$GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']['TYPO3\\CMS\\Frontend\\Imaging\\GifBuilder'] = [
- 'className' => 'SourceBroker\\Imageopt\\Xclass\\GifBuilder'
-];
 $GLOBALS['TYPO3_CONF_VARS']['SYS']['Objects']['TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer'] = [
  'className' => 'SourceBroker\\Imageopt\\Xclass\\ContentObjectRenderer'
 ];

ext_localconf.php

@@ -0,0 +1,12 @@
+plugin.tx_imageopt {
+ imageProcessing {
+ // Force processing of all images on frontend because imageopt should not optimize original images.
+ force = 1
+ exclusion {
+ // Regexp on filepath and filename. When true this file will not be forced to be processed on frontend.
+ // Example /animation.*\.gif/ -> do not force gif files that have animation in name or folder name.
+ // Example /\.gif/ -> do not force gif files
+ regexp =
+ }
+ }
+}