/** * Adds updated files to the processing queue * * @param array $fileIdentifierArray * @return void */ protected function detectChangedFilesInStorage(array $fileIdentifierArray) { foreach ($fileIdentifierArray as $fileIdentifier) { // skip processed files if (strpos($fileIdentifier, $this->storage->getProcessingFolder()->getIdentifier()) === 0) { continue; } // Get the modification time for file-identifier from the storage $modificationTime = $this->storage->getFileInfoByIdentifier($fileIdentifier, array('mtime')); // Look if the the modification time in FS is higher than the one in database (key needed on timestamps) $indexRecord = $this->getFileIndexRepository()->findOneByStorageUidAndIdentifier($this->storage->getUid(), $fileIdentifier); if ($indexRecord !== FALSE) { $this->identifiedFileUids[] = $indexRecord['uid']; if ($indexRecord['modification_date'] < $modificationTime['mtime'] || $indexRecord['missing']) { $this->filesToUpdate[$fileIdentifier] = $indexRecord; } } else { $this->filesToUpdate[$fileIdentifier] = NULL; } } }
/** * This method actually does the processing of files locally * * takes the original file (on remote storages this will be fetched from the remote server) * does the IM magic on the local server by creating a temporary typo3temp/ file * copies the typo3temp/ file to the processingfolder of the target storage * removes the typo3temp/ file * * @param \TYPO3\CMS\Core\Resource\ProcessedFile $processedFile * @param \TYPO3\CMS\Core\Resource\FileInterface $file * @param array $configuration * @return void */ protected function processImageCropResizeMask(\TYPO3\CMS\Core\Resource\ProcessedFile $processedFile, \TYPO3\CMS\Core\Resource\FileInterface $file, array $configuration) { // checks to see if m (the mask array) is defined $doMasking = is_array($configuration['maskImages']) && $GLOBALS['TYPO3_CONF_VARS']['GFX']['im']; // @todo: is it ok that we use tslib (=FE) here? /** @var $gifBuilder tslib_gifbuilder */ $gifBuilder = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tslib_gifbuilder'); $gifBuilder->init(); // @todo: this is not clean yet if (!trim($configuration['fileExtension'])) { $configuration['fileExtension'] = 'web'; $targetFileExtension = $file->getExtension(); } elseif ($doMasking) { $targetFileExtension = $file->getExtension() == $gifBuilder->gifExtension ? $gifBuilder->gifExtension : 'jpg'; } else { $targetFileExtension = $configuration['fileExtension']; } $originalFileName = $file->getForLocalProcessing(FALSE); $targetFolder = $this->storage->getProcessingFolder(); $targetFileName = 'previewcrm_' . $processedFile->calculateChecksum() . '.' . $targetFileExtension; // @todo: implement meaningful TempFileIndex if ($configuration['useSample']) { $gifBuilder->scalecmd = '-sample'; } $options = array(); if ($configuration['maxWidth']) { $options['maxW'] = $configuration['maxWidth']; } if ($configuration['maxHeight']) { $options['maxH'] = $configuration['maxHeight']; } if ($configuration['minWidth']) { $options['minW'] = $configuration['minWidth']; } if ($configuration['minHeight']) { $options['minH'] = $configuration['minHeight']; } $options['noScale'] = $configuration['noScale']; $configuration['additionalParameters'] = $this->modifyImageMagickStripProfileParameters($configuration['additionalParameters'], $configuration); // Do the actual processing if (!$targetFolder->hasFile($targetFileName)) { if (!$doMasking) { // Normal situation (no masking) // the result info is an array with 0=width,1=height,2=extension,3=filename list($targetWidth, $targetHeight, $targetExtension, $temporaryFileName) = $gifBuilder->imageMagickConvert($originalFileName, $configuration['fileExtension'], $configuration['width'], $configuration['height'], $configuration['additionalParameters'], $configuration['frame'], $options); } else { $temporaryFileName = $gifBuilder->tempPath . $targetFileName; $maskImage = $configuration['maskImages']['maskImage']; $maskBackgroundImage = $configuration['maskImages']['backgroundImage']; if ($maskImage instanceof \TYPO3\CMS\Core\Resource\FileInterface && $maskBackgroundImage instanceof \TYPO3\CMS\Core\Resource\FileInterface) { $negate = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_negate_mask'] ? ' -negate' : ''; $temporaryExtension = 'png'; if ($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_mask_temp_ext_gif']) { // If ImageMagick version 5+ $temporaryExtension = $gifBuilder->gifExtension; } $tempFileInfo = $gifBuilder->imageMagickConvert($originalFileName, $temporaryExtension, $configuration['width'], $configuration['height'], $configuration['additionalParameters'], $configuration['frame'], $options); if (is_array($tempFileInfo)) { $maskBottomImage = $configuration['maskImages']['maskBottomImage']; if ($maskBottomImage instanceof $maskBottomImage) { $maskBottomImageMask = $configuration['maskImages']['maskBottomImageMask']; } // Scaling: **** $tempScale = array(); $command = '-geometry ' . $tempFileInfo[0] . 'x' . $tempFileInfo[1] . '!'; $command = $this->modifyImageMagickStripProfileParameters($command, $configuration); $tmpStr = $gifBuilder->randomName(); // m_mask $tempScale['m_mask'] = $tmpStr . '_mask.' . $temporaryExtension; $gifBuilder->imageMagickExec($maskImage->getForLocalProcessing(TRUE), $tempScale['m_mask'], $command . $negate); // m_bgImg $tempScale['m_bgImg'] = $tmpStr . '_bgImg.' . trim($GLOBALS['TYPO3_CONF_VARS']['GFX']['im_mask_temp_ext_noloss']); $gifBuilder->imageMagickExec($maskBackgroundImage->getForLocalProcessing(), $tempScale['m_bgImg'], $command); // m_bottomImg / m_bottomImg_mask if ($maskBottomImage instanceof \TYPO3\CMS\Core\Resource\FileInterface && $maskBottomImageMask instanceof \TYPO3\CMS\Core\Resource\FileInterface) { $tempScale['m_bottomImg'] = $tmpStr . '_bottomImg.' . $temporaryExtension; $gifBuilder->imageMagickExec($maskBottomImage->getForLocalProcessing(), $tempScale['m_bottomImg'], $command); $tempScale['m_bottomImg_mask'] = $tmpStr . '_bottomImg_mask.' . $temporaryExtension; $gifBuilder->imageMagickExec($maskBottomImageMask->getForLocalProcessing(), $tempScale['m_bottomImg_mask'], $command . $negate); // BEGIN combining: // The image onto the background $gifBuilder->combineExec($tempScale['m_bgImg'], $tempScale['m_bottomImg'], $tempScale['m_bottomImg_mask'], $tempScale['m_bgImg']); } // The image onto the background $gifBuilder->combineExec($tempScale['m_bgImg'], $tempFileInfo[3], $tempScale['m_mask'], $temporaryFileName); // Unlink the temp-images... foreach ($tempScale as $file) { if (@is_file($file)) { unlink($file); } } } } // Finish off list($targetWidth, $targetHeight) = $gifBuilder->getImageDimensions($temporaryFileName); } // Temporary image was created if (file_exists($temporaryFileName)) { $updatedProperties = array('width' => $targetWidth, 'height' => $targetHeight); // ImageMagick did not have to do anything, as it is already there... if ($originalFileName !== $temporaryFileName) { \TYPO3\CMS\Core\Utility\GeneralUtility::fixPermissions($temporaryFileName); // Copy the temporary file to the processedFolder // this is done here, as the driver can do this without worrying // about existing ProcessedFile objects // or permissions in the storage // for "remote" storages this means "uploading" the file to the storage again // for the virtual storage, it is merely a thing of "copying a file from typo3temp/ to typo3temp/_processed_" $this->driver->addFile($temporaryFileName, $targetFolder, $targetFileName, $processedFile); // Remove the temporary file as it's not needed anymore \TYPO3\CMS\Core\Utility\GeneralUtility::unlink_tempfile($temporaryFileName); } else { } $processedFile->updateProperties($updatedProperties); $processedFile->setProcessed(TRUE); } } }
/** * Processes the file * * @param Resource\ProcessedFile $processedFile * @param Resource\ResourceStorage $targetStorage The storage to put the processed file into * * @throws \RuntimeException */ protected function process(Resource\ProcessedFile $processedFile, Resource\ResourceStorage $targetStorage) { $targetFolder = $targetStorage->getProcessingFolder(); if (!is_object($targetFolder)) { throw new \RuntimeException('Could not get processing folder for storage ' . $this->storage->getName(), 1350514301); } // We only have to trigger the file processing if the file either is new, does not exist or the // original file has changed since the last processing run (the last case has to trigger a reprocessing // even if the original file was used until now) if ($processedFile->isNew() || !$processedFile->usesOriginalFile() && !$processedFile->exists() || $processedFile->isOutdated()) { $task = $processedFile->getTask(); /** @var $processor Resource\Processing\LocalImageProcessor */ $processor = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\Processing\\LocalImageProcessor'); $processor->processTask($task); if ($processedFile->isProcessed()) { /** @var $processedFileRepository Resource\ProcessedFileRepository */ $processedFileRepository = Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\ProcessedFileRepository'); $processedFileRepository->add($processedFile); } } }