fabarea / media

Classes/Form/FileUploadTceForms.php

Indentation +46 added lines, -46 removed lines

@@ -20,56 +20,56 @@
  */
 class FileUploadTceForms extends FileUpload
 {
-    /**
-     * @var string
-     */
-    protected string $templateFile = 'Resources/Private/Standalone/FileUploadTceFormsTemplate.html';
+	/**
+	 * @var string
+	 */
+	protected string $templateFile = 'Resources/Private/Standalone/FileUploadTceFormsTemplate.html';
 
-    /**
-     * Fetch the JavaScript to be rendered and replace the markers with "live" variables.
-     */
-    protected function getJavaScript(): string
-    {
-        // Get the base prefix.
-        $basePrefix = $this->getBasePrefix($this->getPrefix());
-        $filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
+	/**
+	 * Fetch the JavaScript to be rendered and replace the markers with "live" variables.
+	 */
+	protected function getJavaScript(): string
+	{
+		// Get the base prefix.
+		$basePrefix = $this->getBasePrefix($this->getPrefix());
+		$filePath = ExtensionManagementUtility::extPath('media') . 'Resources/Private/Standalone/FileUploadTceForms.js';
 
-        return sprintf(
-            file_get_contents($filePath),
-            $basePrefix,
-            $this->elementId,
-            $this->getModuleUrl(),
-            $this->getAllowedExtension(),
-            GeneralUtility::getMaxUploadFileSize() * 1024,
-            $this->getValue()
-        );
-    }
+		return sprintf(
+			file_get_contents($filePath),
+			$basePrefix,
+			$this->elementId,
+			$this->getModuleUrl(),
+			$this->getAllowedExtension(),
+			GeneralUtility::getMaxUploadFileSize() * 1024,
+			$this->getValue()
+		);
+	}
 
-    protected function getModuleUrl(): string
-    {
-        $moduleSignature = MediaModule::getSignature();
-        return BackendUtility::getModuleUrl($moduleSignature);
-    }
+	protected function getModuleUrl(): string
+	{
+		$moduleSignature = MediaModule::getSignature();
+		return BackendUtility::getModuleUrl($moduleSignature);
+	}
 
-    /**
-     * Get allowed extension.
-     */
-    protected function getAllowedExtension(): string
-    {
-        return $this->file->getExtension();
-    }
+	/**
+	 * Get allowed extension.
+	 */
+	protected function getAllowedExtension(): string
+	{
+		return $this->file->getExtension();
+	}
 
-    /**
-     * Returns additional file info.
-     */
-    protected function getFileInfo(): string
-    {
-        /** @var MetadataView $metadataView */
-        $metadataView = GeneralUtility::makeInstance(MetadataView::class);
+	/**
+	 * Returns additional file info.
+	 */
+	protected function getFileInfo(): string
+	{
+		/** @var MetadataView $metadataView */
+		$metadataView = GeneralUtility::makeInstance(MetadataView::class);
 
-        return sprintf(
-            '<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
-            $metadataView->render($this->file)
-        );
-    }
+		return sprintf(
+			'<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
+			$metadataView->render($this->file)
+		);
+	}
 }

Classes/Controller/AssetController.php

Indentation +309 added lines, -309 removed lines

@@ -47,313 +47,313 @@
  */
 class AssetController extends ActionController
 {
-    /**
-     * @var string
-     */
-    protected $dataType = 'sys_file';
-
-    /**
-     * @throws StorageNotOnlineException
-     * @throws \InvalidArgumentException
-     * @throws NoSuchArgumentException
-     */
-    public function initializeAction()
-    {
-        $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
-        $pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
-
-        // Configure property mapping to retrieve the file object.
-        if ($this->arguments->hasArgument('file')) {
-            /** @var FileConverter $typeConverter */
-            $typeConverter = GeneralUtility::makeInstance(FileConverter::class);
-
-            $propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
-            $propertyMappingConfiguration->setTypeConverter($typeConverter);
-        }
-    }
-
-    /**
-     * Force download of the file.
-     *
-     * @param File $file
-     * @param bool $forceDownload
-     * @return bool|string
-     * @throws \RuntimeException
-     */
-    public function downloadAction(File $file, $forceDownload = false): ResponseInterface
-    {
-        if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
-            // Emit signal before downloading the file.
-            $this->emitBeforeDownloadSignal($file);
-
-            // Read the file and dump it with the flag "forceDownload" set to true or false.
-            $file->getStorage()->streamFile($file, $forceDownload);
-
-            $result = true;
-        } else {
-            $result = 'Access denied!';
-        }
-
-        return $this->htmlResponse($result);
-    }
-
-    /**
-     * Handle file upload for a new file.
-     *
-     * @param string $combinedIdentifier
-     * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
-     * @return string
-     */
-    public function createAction($combinedIdentifier): ResponseInterface
-    {
-        /** @var UploadedFileInterface $uploadedFile */
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
-        }
-
-        // Get the target folder.
-        if ($this->getMediaModule()->hasFolderTree()) {
-            $targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
-        } else {
-            $storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
-            $targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
-        }
-
-        try {
-            $conflictMode = DuplicationBehavior::RENAME;
-            $fileName = $uploadedFile->getName();
-            $file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->extractMetadata($file)
-                ->applyDefaultCategories($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
-    }
-
-    /**
-     * Handle file upload for an existing file.
-     *
-     * @param File $file
-     * @return string
-     * @throws \InvalidArgumentException
-     * @throws \RuntimeException
-     */
-    public function updateAction(File $file): ResponseInterface
-    {
-        $uploadedFile = $this->handleUpload();
-        if (!is_object($uploadedFile)) {
-            return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
-        }
-
-        /** @var $file File */
-        $targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
-
-        try {
-            $storage = $file->getStorage();
-            $storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
-
-            // Run the indexer for extracting metadata.
-            $this->getMediaIndexer($file->getStorage())
-                ->updateIndex($file)
-                ->extractMetadata($file);
-
-            // Clear cache on pages holding a reference to this file.
-            $this->getCacheService()->clearCache($file);
-
-            $response = array(
-                'success' => true,
-                'uid' => $file->getUid(),
-                'name' => $file->getName(),
-                'thumbnail' => $this->getThumbnailService($file)->create(),
-                'fileInfo' => $this->getMetadataView()->render($file),
-            );
-        } catch (UploadException $e) {
-            $response = array('error' => 'The upload has failed, no uploaded file found!');
-        } catch (InsufficientUserPermissionsException $e) {
-            $response = array('error' => 'You are not allowed to upload files!');
-        } catch (UploadSizeException $e) {
-            $response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
-        } catch (InsufficientFolderWritePermissionsException $e) {
-            $response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
-        } catch (IllegalFileExtensionException $e) {
-            $response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
-        } catch (ExistingTargetFileNameException $e) {
-            $response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
-        } catch (\RuntimeException $e) {
-            $response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
-        }
-
-        // to pass data through iframe you will need to encode all html tags
-        header("Content-Type: text/plain");
-        return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
-    }
-
-    /**
-     * Returns an editing form for moving Files between storage.
-     *
-     * @param array $matches
-     * @throws \Exception
-     */
-    public function editStorageAction(array $matches = []): ResponseInterface
-    {
-        $this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
-        $this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
-
-        $fieldName = 'storage';
-
-        // Instantiate the Matcher object according different rules.
-        $matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
-
-        // Fetch objects via the Content Service.
-        $contentService = $this->getContentService()->findBy($matcher);
-
-        $fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
-
-        $this->view->assign('fieldType', ucfirst($fieldType));
-        $this->view->assign('dataType', $this->dataType);
-        $this->view->assign('matches', $matches);
-        $this->view->assign('fieldNameAndPath', $fieldName);
-        $this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
-        $this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
-        return $this->htmlResponse();
-    }
-
-    /**
-     * Handle file upload.
-     *
-     * @return UploadedFileInterface|array
-     * @throws \InvalidArgumentException
-     */
-    protected function handleUpload()
-    {
-        /** @var $uploadManager UploadManager */
-        $uploadManager = GeneralUtility::makeInstance(UploadManager::class);
-
-        try {
-            /** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
-            $result = $uploadManager->handleUpload();
-        } catch (\Exception $e) {
-            $result = array('error' => $e->getMessage());
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return MetadataView
-     * @throws \InvalidArgumentException
-     */
-    protected function getMetadataView()
-    {
-        return GeneralUtility::makeInstance(MetadataView::class);
-    }
-
-    /**
-     * @param File $file
-     * @return ThumbnailService
-     * @throws InvalidKeyInArrayException
-     * @throws \InvalidArgumentException
-     */
-    protected function getThumbnailService(File $file)
-    {
-        /** @var $thumbnailService ThumbnailService */
-        $thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
-        $thumbnailService->setAppendTimeStamp(true)
-            ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
-        return $thumbnailService;
-    }
-
-    /**
-     * Get the instance of the Indexer service to update the metadata of the file.
-     *
-     * @param int|ResourceStorage $storage
-     * @return MediaIndexer
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaIndexer($storage)
-    {
-        return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
-    }
-
-    /**
-     * @return CacheService
-     * @throws \InvalidArgumentException
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(CacheService::class);
-    }
-
-    /**
-     * Signal that is emitted before a file is downloaded.
-     *
-     * @param File $file
-     * @return void
-     * @throws InvalidSlotReturnException
-     * @throws InvalidSlotException
-     */
-    protected function emitBeforeDownloadSignal(File $file)
-    {
-        $this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
-    }
-
-    /**
-     * Get the SignalSlot dispatcher.
-     *
-     * @return Dispatcher
-     */
-    protected function getSignalSlotDispatcher()
-    {
-        return GeneralUtility::makeInstance(Dispatcher::class);
-    }
-
-    /**
-     * @return ContentService
-     * @throws \InvalidArgumentException
-     */
-    protected function getContentService()
-    {
-        return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
-    }
-
-    /**
-     * @return MediaModule|object
-     * @throws \InvalidArgumentException
-     */
-    protected function getMediaModule()
-    {
-        return GeneralUtility::makeInstance(MediaModule::class);
-    }
-
-    protected function getResourceFactory(): ResourceFactory
-    {
-        return GeneralUtility::makeInstance(ResourceFactory::class);
-    }
+	/**
+	 * @var string
+	 */
+	protected $dataType = 'sys_file';
+
+	/**
+	 * @throws StorageNotOnlineException
+	 * @throws \InvalidArgumentException
+	 * @throws NoSuchArgumentException
+	 */
+	public function initializeAction()
+	{
+		$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
+		$pageRenderer->addInlineLanguageLabelFile('EXT:media/Resources/Private/Language/locallang.xlf');
+
+		// Configure property mapping to retrieve the file object.
+		if ($this->arguments->hasArgument('file')) {
+			/** @var FileConverter $typeConverter */
+			$typeConverter = GeneralUtility::makeInstance(FileConverter::class);
+
+			$propertyMappingConfiguration = $this->arguments->getArgument('file')->getPropertyMappingConfiguration();
+			$propertyMappingConfiguration->setTypeConverter($typeConverter);
+		}
+	}
+
+	/**
+	 * Force download of the file.
+	 *
+	 * @param File $file
+	 * @param bool $forceDownload
+	 * @return bool|string
+	 * @throws \RuntimeException
+	 */
+	public function downloadAction(File $file, $forceDownload = false): ResponseInterface
+	{
+		if ($file->exists() && $file->getStorage()->isWithinFileMountBoundaries($file->getParentFolder())) {
+			// Emit signal before downloading the file.
+			$this->emitBeforeDownloadSignal($file);
+
+			// Read the file and dump it with the flag "forceDownload" set to true or false.
+			$file->getStorage()->streamFile($file, $forceDownload);
+
+			$result = true;
+		} else {
+			$result = 'Access denied!';
+		}
+
+		return $this->htmlResponse($result);
+	}
+
+	/**
+	 * Handle file upload for a new file.
+	 *
+	 * @param string $combinedIdentifier
+	 * @Extbase\Validate("\Fab\Media\Domain\Validator\StorageValidator", param="combinedIdentifier")
+	 * @return string
+	 */
+	public function createAction($combinedIdentifier): ResponseInterface
+	{
+		/** @var UploadedFileInterface $uploadedFile */
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
+		}
+
+		// Get the target folder.
+		if ($this->getMediaModule()->hasFolderTree()) {
+			$targetFolder = $this->getMediaModule()->getFolderForCombinedIdentifier($combinedIdentifier);
+		} else {
+			$storage = $this->getResourceFactory()->getStorageObjectFromCombinedIdentifier($combinedIdentifier);
+			$targetFolder = $this->getMediaModule()->getTargetFolderForUploadedFile($uploadedFile, $storage);
+		}
+
+		try {
+			$conflictMode = DuplicationBehavior::RENAME;
+			$fileName = $uploadedFile->getName();
+			$file = $targetFolder->addFile($uploadedFile->getFileWithAbsolutePath(), $fileName, $conflictMode);
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->extractMetadata($file)
+				->applyDefaultCategories($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
+	}
+
+	/**
+	 * Handle file upload for an existing file.
+	 *
+	 * @param File $file
+	 * @return string
+	 * @throws \InvalidArgumentException
+	 * @throws \RuntimeException
+	 */
+	public function updateAction(File $file): ResponseInterface
+	{
+		$uploadedFile = $this->handleUpload();
+		if (!is_object($uploadedFile)) {
+			return $this->htmlResponse(htmlspecialchars(json_encode($uploadedFile), ENT_NOQUOTES));
+		}
+
+		/** @var $file File */
+		$targetFolder = $file->getStorage()->getFolder(dirname($file->getIdentifier()));
+
+		try {
+			$storage = $file->getStorage();
+			$storage->replaceFile($file, $uploadedFile->getFileWithAbsolutePath());
+
+			// Run the indexer for extracting metadata.
+			$this->getMediaIndexer($file->getStorage())
+				->updateIndex($file)
+				->extractMetadata($file);
+
+			// Clear cache on pages holding a reference to this file.
+			$this->getCacheService()->clearCache($file);
+
+			$response = array(
+				'success' => true,
+				'uid' => $file->getUid(),
+				'name' => $file->getName(),
+				'thumbnail' => $this->getThumbnailService($file)->create(),
+				'fileInfo' => $this->getMetadataView()->render($file),
+			);
+		} catch (UploadException $e) {
+			$response = array('error' => 'The upload has failed, no uploaded file found!');
+		} catch (InsufficientUserPermissionsException $e) {
+			$response = array('error' => 'You are not allowed to upload files!');
+		} catch (UploadSizeException $e) {
+			$response = array('error' => vsprintf('The uploaded file "%s" exceeds the size-limit', array($uploadedFile->getName())));
+		} catch (InsufficientFolderWritePermissionsException $e) {
+			$response = array('error' => vsprintf('Destination path "%s" was not within your mount points!', array($targetFolder->getIdentifier())));
+		} catch (IllegalFileExtensionException $e) {
+			$response = array('error' => vsprintf('Extension of file name "%s" is not allowed in "%s"!', array($uploadedFile->getName(), $targetFolder->getIdentifier())));
+		} catch (ExistingTargetFileNameException $e) {
+			$response = array('error' => vsprintf('No unique filename available in "%s"!', array($targetFolder->getIdentifier())));
+		} catch (\RuntimeException $e) {
+			$response = array('error' => vsprintf('Uploaded file could not be moved! Write-permission problem in "%s"?', array($targetFolder->getIdentifier())));
+		}
+
+		// to pass data through iframe you will need to encode all html tags
+		header("Content-Type: text/plain");
+		return $this->htmlResponse(htmlspecialchars(json_encode($response), ENT_NOQUOTES));
+	}
+
+	/**
+	 * Returns an editing form for moving Files between storage.
+	 *
+	 * @param array $matches
+	 * @throws \Exception
+	 */
+	public function editStorageAction(array $matches = []): ResponseInterface
+	{
+		$this->view->assign('storages', $this->getMediaModule()->getAllowedStorages());
+		$this->view->assign('storageTitle', Tca::table('sys_file_storage')->getTitle());
+
+		$fieldName = 'storage';
+
+		// Instantiate the Matcher object according different rules.
+		$matcher = MatcherObjectFactory::getInstance()->getMatcher($matches, $this->dataType);
+
+		// Fetch objects via the Content Service.
+		$contentService = $this->getContentService()->findBy($matcher);
+
+		$fieldType = Tca::table($this->dataType)->field($fieldName)->getType();
+
+		$this->view->assign('fieldType', ucfirst($fieldType));
+		$this->view->assign('dataType', $this->dataType);
+		$this->view->assign('matches', $matches);
+		$this->view->assign('fieldNameAndPath', $fieldName);
+		$this->view->assign('numberOfObjects', $contentService->getNumberOfObjects());
+		$this->view->assign('editWholeSelection', empty($matches['uid'])); // necessary??
+		return $this->htmlResponse();
+	}
+
+	/**
+	 * Handle file upload.
+	 *
+	 * @return UploadedFileInterface|array
+	 * @throws \InvalidArgumentException
+	 */
+	protected function handleUpload()
+	{
+		/** @var $uploadManager UploadManager */
+		$uploadManager = GeneralUtility::makeInstance(UploadManager::class);
+
+		try {
+			/** @var $result \Fab\Media\FileUpload\UploadedFileInterface */
+			$result = $uploadManager->handleUpload();
+		} catch (\Exception $e) {
+			$result = array('error' => $e->getMessage());
+		}
+
+		return $result;
+	}
+
+	/**
+	 * @return MetadataView
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMetadataView()
+	{
+		return GeneralUtility::makeInstance(MetadataView::class);
+	}
+
+	/**
+	 * @param File $file
+	 * @return ThumbnailService
+	 * @throws InvalidKeyInArrayException
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getThumbnailService(File $file)
+	{
+		/** @var $thumbnailService ThumbnailService */
+		$thumbnailService = GeneralUtility::makeInstance(ThumbnailService::class, $file);
+		$thumbnailService->setAppendTimeStamp(true)
+			->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED);
+		return $thumbnailService;
+	}
+
+	/**
+	 * Get the instance of the Indexer service to update the metadata of the file.
+	 *
+	 * @param int|ResourceStorage $storage
+	 * @return MediaIndexer
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaIndexer($storage)
+	{
+		return GeneralUtility::makeInstance(MediaIndexer::class, $storage);
+	}
+
+	/**
+	 * @return CacheService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(CacheService::class);
+	}
+
+	/**
+	 * Signal that is emitted before a file is downloaded.
+	 *
+	 * @param File $file
+	 * @return void
+	 * @throws InvalidSlotReturnException
+	 * @throws InvalidSlotException
+	 */
+	protected function emitBeforeDownloadSignal(File $file)
+	{
+		$this->getSignalSlotDispatcher()->dispatch('Fab\Media\Controller\Backend\AssetController', 'beforeDownload', array($file));
+	}
+
+	/**
+	 * Get the SignalSlot dispatcher.
+	 *
+	 * @return Dispatcher
+	 */
+	protected function getSignalSlotDispatcher()
+	{
+		return GeneralUtility::makeInstance(Dispatcher::class);
+	}
+
+	/**
+	 * @return ContentService
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getContentService()
+	{
+		return GeneralUtility::makeInstance(ContentService::class, $this->dataType);
+	}
+
+	/**
+	 * @return MediaModule|object
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getMediaModule()
+	{
+		return GeneralUtility::makeInstance(MediaModule::class);
+	}
+
+	protected function getResourceFactory(): ResourceFactory
+	{
+		return GeneralUtility::makeInstance(ResourceFactory::class);
+	}
 }

Classes/Grid/PreviewRenderer.php

Indentation +69 added lines, -69 removed lines

@@ -23,81 +23,81 @@
  */
 class PreviewRenderer extends ColumnRendererAbstract
 {
-    /**
-     * Render a preview of a file in the Grid.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        $file = $this->getFileConverter()->convert($this->object);
+	/**
+	 * Render a preview of a file in the Grid.
+	 *
+	 * @return string
+	 */
+	public function render()
+	{
+		$file = $this->getFileConverter()->convert($this->object);
 
-        $uri = false;
-        $appendTime = true;
+		$uri = false;
+		$appendTime = true;
 
-        // Compute image-editor or link-creator URL.
-        if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
-            $appendTime = false;
-            $uri = $this->getPluginUri('ImageEditor');
-        } elseif ($this->getModuleLoader()->hasPlugin('linkCreator')) {
-            $appendTime = false;
-            $uri = $this->getPluginUri('LinkCreator');
-        }
+		// Compute image-editor or link-creator URL.
+		if ($this->getModuleLoader()->hasPlugin('imageEditor')) {
+			$appendTime = false;
+			$uri = $this->getPluginUri('ImageEditor');
+		} elseif ($this->getModuleLoader()->hasPlugin('linkCreator')) {
+			$appendTime = false;
+			$uri = $this->getPluginUri('LinkCreator');
+		}
 
-        $result = $this->getThumbnailService($file)
-            ->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
-            ->setAppendTimeStamp($appendTime)
-            ->setTarget(ThumbnailInterface::TARGET_BLANK)
-            ->setAnchorUri($uri)
-            ->setAttributes([])
-            ->create();
+		$result = $this->getThumbnailService($file)
+			->setOutputType(ThumbnailInterface::OUTPUT_IMAGE_WRAPPED)
+			->setAppendTimeStamp($appendTime)
+			->setTarget(ThumbnailInterface::TARGET_BLANK)
+			->setAnchorUri($uri)
+			->setAttributes([])
+			->create();
 
-        // Add file info
-        $result .= sprintf(
-            '<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
-            $this->getMetadataView()->render($file)
-        );
-        return $result;
-    }
+		// Add file info
+		$result .= sprintf(
+			'<div class="container-fileInfo" style="font-size: 7pt; color: #777;">%s</div>',
+			$this->getMetadataView()->render($file)
+		);
+		return $result;
+	}
 
-    /**
-     * @param File $file
-     * @return ThumbnailService|object
-     */
-    protected function getThumbnailService(File $file)
-    {
-        return GeneralUtility::makeInstance(ThumbnailService::class, $file);
-    }
+	/**
+	 * @param File $file
+	 * @return ThumbnailService|object
+	 */
+	protected function getThumbnailService(File $file)
+	{
+		return GeneralUtility::makeInstance(ThumbnailService::class, $file);
+	}
 
-    /**
-     * @return MetadataView|object
-     */
-    protected function getMetadataView()
-    {
-        return GeneralUtility::makeInstance(MetadataView::class);
-    }
+	/**
+	 * @return MetadataView|object
+	 */
+	protected function getMetadataView()
+	{
+		return GeneralUtility::makeInstance(MetadataView::class);
+	}
 
-    /**
-     * @param string $controllerName
-     * @return string
-     */
-    protected function getPluginUri($controllerName)
-    {
-        $urlParameters = array(
-            MediaModule::getParameterPrefix() => array(
-                'controller' => $controllerName,
-                'action' => 'show',
-                'file' => $this->object->getUid(),
-            ),
-        );
-        return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
-    }
+	/**
+	 * @param string $controllerName
+	 * @return string
+	 */
+	protected function getPluginUri($controllerName)
+	{
+		$urlParameters = array(
+			MediaModule::getParameterPrefix() => array(
+				'controller' => $controllerName,
+				'action' => 'show',
+				'file' => $this->object->getUid(),
+			),
+		);
+		return BackendUtility::getModuleUrl(MediaModule::getSignature(), $urlParameters);
+	}
 
-    /**
-     * @return ContentToFileConverter|object
-     */
-    protected function getFileConverter()
-    {
-        return GeneralUtility::makeInstance(ContentToFileConverter::class);
-    }
+	/**
+	 * @return ContentToFileConverter|object
+	 */
+	protected function getFileConverter()
+	{
+		return GeneralUtility::makeInstance(ContentToFileConverter::class);
+	}
 }