fabarea / media

Classes/FileUpload/UploadedFileAbstract.php

Indentation +137 added lines, -137 removed lines

@@ -19,142 +19,142 @@
 abstract class UploadedFileAbstract implements UploadedFileInterface
 {
 
-    /**
-     * @var string
-     */
-    protected $uploadFolder;
-
-    /**
-     * @var string
-     */
-    protected $inputName;
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * Get the file type.
-     *
-     * @return int
-     */
-    public function getType()
-    {
-        $this->checkFileExistence();
-
-        // this basically extracts the mimetype and guess the filetype based
-        // on the first part of the mimetype works for 99% of all cases, and
-        // we don't need to make an SQL statement like EXT:media does currently
-        $mimeType = $this->getMimeType();
-        list($fileType) = explode('/', $mimeType);
-        switch (strtolower($fileType)) {
-            case 'text':
-                $type = File::FILETYPE_TEXT;
-                break;
-            case 'image':
-                $type = File::FILETYPE_IMAGE;
-                break;
-            case 'audio':
-                $type = File::FILETYPE_AUDIO;
-                break;
-            case 'video':
-                $type = File::FILETYPE_VIDEO;
-                break;
-            case 'application':
-            case 'software':
-                $type = File::FILETYPE_APPLICATION;
-                break;
-            default:
-                $type = File::FILETYPE_UNKNOWN;
-        }
-        return $type;
-    }
-
-    /**
-     * Get the file with its absolute path.
-     *
-     * @return string
-     */
-    public function getFileWithAbsolutePath()
-    {
-        return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
-    }
-
-    /**
-     * Get the file's public URL.
-     *
-     * @return string
-     */
-    public function getPublicUrl()
-    {
-        $fileNameAndPath = str_replace(Environment::getPublicPath() . '/', '', $this->getFileWithAbsolutePath());
-        return '/' . ltrim($fileNameAndPath, '/');
-    }
-
-    /**
-     * @return string
-     */
-    public function getInputName()
-    {
-        return $this->inputName;
-    }
-
-    /**
-     * @param string $inputName
-     * @return UploadedFileInterface
-     */
-    public function setInputName($inputName)
-    {
-        $this->inputName = $inputName;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getUploadFolder()
-    {
-        return $this->uploadFolder;
-    }
-
-    /**
-     * @param string $uploadFolder
-     * @return UploadedFileInterface
-     */
-    public function setUploadFolder($uploadFolder)
-    {
-        $this->uploadFolder = $uploadFolder;
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @param string $name
-     * @return UploadedFileInterface
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * Check whether the file exists.
-     */
-    protected function checkFileExistence()
-    {
-        if (!is_file($this->getFileWithAbsolutePath())) {
-            $message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
-            throw new MissingFileException($message, 1361786958);
-        }
-    }
+	/**
+	 * @var string
+	 */
+	protected $uploadFolder;
+
+	/**
+	 * @var string
+	 */
+	protected $inputName;
+
+	/**
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Get the file type.
+	 *
+	 * @return int
+	 */
+	public function getType()
+	{
+		$this->checkFileExistence();
+
+		// this basically extracts the mimetype and guess the filetype based
+		// on the first part of the mimetype works for 99% of all cases, and
+		// we don't need to make an SQL statement like EXT:media does currently
+		$mimeType = $this->getMimeType();
+		list($fileType) = explode('/', $mimeType);
+		switch (strtolower($fileType)) {
+			case 'text':
+				$type = File::FILETYPE_TEXT;
+				break;
+			case 'image':
+				$type = File::FILETYPE_IMAGE;
+				break;
+			case 'audio':
+				$type = File::FILETYPE_AUDIO;
+				break;
+			case 'video':
+				$type = File::FILETYPE_VIDEO;
+				break;
+			case 'application':
+			case 'software':
+				$type = File::FILETYPE_APPLICATION;
+				break;
+			default:
+				$type = File::FILETYPE_UNKNOWN;
+		}
+		return $type;
+	}
+
+	/**
+	 * Get the file with its absolute path.
+	 *
+	 * @return string
+	 */
+	public function getFileWithAbsolutePath()
+	{
+		return $this->uploadFolder . DIRECTORY_SEPARATOR . $this->name;
+	}
+
+	/**
+	 * Get the file's public URL.
+	 *
+	 * @return string
+	 */
+	public function getPublicUrl()
+	{
+		$fileNameAndPath = str_replace(Environment::getPublicPath() . '/', '', $this->getFileWithAbsolutePath());
+		return '/' . ltrim($fileNameAndPath, '/');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getInputName()
+	{
+		return $this->inputName;
+	}
+
+	/**
+	 * @param string $inputName
+	 * @return UploadedFileInterface
+	 */
+	public function setInputName($inputName)
+	{
+		$this->inputName = $inputName;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getUploadFolder()
+	{
+		return $this->uploadFolder;
+	}
+
+	/**
+	 * @param string $uploadFolder
+	 * @return UploadedFileInterface
+	 */
+	public function setUploadFolder($uploadFolder)
+	{
+		$this->uploadFolder = $uploadFolder;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * @param string $name
+	 * @return UploadedFileInterface
+	 */
+	public function setName($name)
+	{
+		$this->name = $name;
+		return $this;
+	}
+
+	/**
+	 * Check whether the file exists.
+	 */
+	protected function checkFileExistence()
+	{
+		if (!is_file($this->getFileWithAbsolutePath())) {
+			$message = sprintf('File not found at "%s". Did you save it?', $this->getFileWithAbsolutePath());
+			throw new MissingFileException($message, 1361786958);
+		}
+	}
 
 }

Classes/Command/FileCacheCommandController.php

Indentation +100 added lines, -100 removed lines

@@ -25,105 +25,105 @@
 class FileCacheCommandController extends CommandController
 {
 
-    /**
-     * Warm up the cache. Update some caching columns such as "number_of_references" to speed up the search.
-     *
-     * @return void
-     */
-    public function warmUpCommand()
-    {
-        $numberOfEntries = $this->getCacheService()->warmUp();
-        $message = sprintf('Done! Processed %s entries', $numberOfEntries);
-        $this->outputLine($message);
-    }
-
-    /**
-     * Flush all processed files to be used for debugging mainly.
-     *
-     * @return void
-     */
-    public function flushProcessedFilesCommand()
-    {
-
-        foreach ($this->getStorageRepository()->findAll() as $storage) {
-
-            // This only works for local driver
-            if ($storage->getDriverType() === 'Local') {
-
-                $this->outputLine();
-                $this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
-                $this->outputLine('--------------------------------------------');
-                $this->outputLine();
-
-                #$storage->getProcessingFolder()->delete(true); // will not work
-
-                // Well... not really FAL friendly but straightforward for Local drivers.
-                $processedDirectoryPath = Environment::getPublicPath() . '/' . $storage->getProcessingFolder()->getPublicUrl();
-                $fileIterator = new FilesystemIterator($processedDirectoryPath, FilesystemIterator::SKIP_DOTS);
-                $numberOfProcessedFiles = iterator_count($fileIterator);
-
-                GeneralUtility::rmdir($processedDirectoryPath, true);
-                GeneralUtility::mkdir($processedDirectoryPath); // recreate the directory.
-
-                $message = sprintf('Done! Removed %s processed file(s).', $numberOfProcessedFiles);
-                $this->outputLine($message);
-
-                $count = $this->getDataService()
-                    ->count(
-                        'sys_file_processedfile',
-                        [
-                            'storage' => $storage->getUid()
-                        ]
-                    );
-
-                // Remove the record as well.
-                $this->getDataService()->delete('sys_file_processedfile', ['storage' => $storage->getUid()]);
-
-                $message = sprintf('Done! Removed %s records from "sys_file_processedfile".', $count);
-                $this->outputLine($message);
-            }
-
-        }
-
-        // Remove possible remaining "sys_file_processedfile"
-        $this
-            ->getConnection('sys_file_processedfile')
-            ->query('TRUNCATE sys_file_processedfile');
-    }
-
-    /**
-     * @return \Fab\Media\Cache\CacheService|object
-     */
-    protected function getCacheService()
-    {
-        return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
-    }
-
-    /**
-     * @return StorageRepository|object
-     */
-    protected function getStorageRepository()
-    {
-        return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
-    }
-
-    /**
-     * @return object|DataService
-     */
-    protected function getDataService(): DataService
-    {
-        return GeneralUtility::makeInstance(DataService::class);
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|Connection
-     */
-    protected function getConnection($tableName): Connection
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getConnectionForTable($tableName);
-    }
+	/**
+	 * Warm up the cache. Update some caching columns such as "number_of_references" to speed up the search.
+	 *
+	 * @return void
+	 */
+	public function warmUpCommand()
+	{
+		$numberOfEntries = $this->getCacheService()->warmUp();
+		$message = sprintf('Done! Processed %s entries', $numberOfEntries);
+		$this->outputLine($message);
+	}
+
+	/**
+	 * Flush all processed files to be used for debugging mainly.
+	 *
+	 * @return void
+	 */
+	public function flushProcessedFilesCommand()
+	{
+
+		foreach ($this->getStorageRepository()->findAll() as $storage) {
+
+			// This only works for local driver
+			if ($storage->getDriverType() === 'Local') {
+
+				$this->outputLine();
+				$this->outputLine(sprintf('%s (%s)', $storage->getName(), $storage->getUid()));
+				$this->outputLine('--------------------------------------------');
+				$this->outputLine();
+
+				#$storage->getProcessingFolder()->delete(true); // will not work
+
+				// Well... not really FAL friendly but straightforward for Local drivers.
+				$processedDirectoryPath = Environment::getPublicPath() . '/' . $storage->getProcessingFolder()->getPublicUrl();
+				$fileIterator = new FilesystemIterator($processedDirectoryPath, FilesystemIterator::SKIP_DOTS);
+				$numberOfProcessedFiles = iterator_count($fileIterator);
+
+				GeneralUtility::rmdir($processedDirectoryPath, true);
+				GeneralUtility::mkdir($processedDirectoryPath); // recreate the directory.
+
+				$message = sprintf('Done! Removed %s processed file(s).', $numberOfProcessedFiles);
+				$this->outputLine($message);
+
+				$count = $this->getDataService()
+					->count(
+						'sys_file_processedfile',
+						[
+							'storage' => $storage->getUid()
+						]
+					);
+
+				// Remove the record as well.
+				$this->getDataService()->delete('sys_file_processedfile', ['storage' => $storage->getUid()]);
+
+				$message = sprintf('Done! Removed %s records from "sys_file_processedfile".', $count);
+				$this->outputLine($message);
+			}
+
+		}
+
+		// Remove possible remaining "sys_file_processedfile"
+		$this
+			->getConnection('sys_file_processedfile')
+			->query('TRUNCATE sys_file_processedfile');
+	}
+
+	/**
+	 * @return \Fab\Media\Cache\CacheService|object
+	 */
+	protected function getCacheService()
+	{
+		return GeneralUtility::makeInstance(\Fab\Media\Cache\CacheService::class);
+	}
+
+	/**
+	 * @return StorageRepository|object
+	 */
+	protected function getStorageRepository()
+	{
+		return GeneralUtility::makeInstance(\TYPO3\CMS\Core\Resource\StorageRepository::class);
+	}
+
+	/**
+	 * @return object|DataService
+	 */
+	protected function getDataService(): DataService
+	{
+		return GeneralUtility::makeInstance(DataService::class);
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|Connection
+	 */
+	protected function getConnection($tableName): Connection
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getConnectionForTable($tableName);
+	}
 
 }

Classes/Index/IndexAnalyser.php

Indentation +160 added lines, -160 removed lines

@@ -22,169 +22,169 @@
 class IndexAnalyser implements SingletonInterface
 {
 
-    /**
-     * Return missing file for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     */
-    public function searchForMissingFiles(ResourceStorage $storage)
-    {
-
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $missingFiles = [];
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )->execute();
-        while ($row = $statement->fetchAssociative()) {
-
-            // This task is very memory consuming on large data set e.g > 20'000 records.
-            // We must think of having a pagination if there is the need for such thing.
-            $file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
-            if (!$file->exists()) {
-                $missingFiles[] = $file;
-            }
-        }
-        return $missingFiles;
-    }
-
-    /**
-     * Deletes all missing files for a given storage.
-     *
-     * @param ResourceStorage $storage
-     * @return array
-     * @throws \InvalidArgumentException
-     */
-    public function deleteMissingFiles(ResourceStorage $storage)
-    {
-        /** @var FileReferenceService $fileReferenceService */
-        $fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
-        $missingFiles = $this->searchForMissingFiles($storage);
-        $deletedFiles = [];
-
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-
-        /** @var \TYPO3\CMS\Core\Resource\File $missingFile */
-        foreach ($missingFiles as $missingFile) {
-            try {
-                // if missingFile has no file references
-                if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
-                    // The case is special as we have a missing file in the file system
-                    // As a result, we can't use $fileObject->delete(); which will
-                    // raise exception "Error while fetching permissions"
-                    $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-                    $queryBuilder->delete('sys_file')
-                        ->where($queryBuilder->expr()->eq('uid', $missingFile->getUid()))
-                        ->execute();
-
-                    $deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
-                }
-            } catch (\Exception $e) {
-                continue;
-            }
-        }
-        return $deletedFiles;
-    }
-
-    /*
+	/**
+	 * Return missing file for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForMissingFiles(ResourceStorage $storage)
+	{
+
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$missingFiles = [];
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)->execute();
+		while ($row = $statement->fetchAssociative()) {
+
+			// This task is very memory consuming on large data set e.g > 20'000 records.
+			// We must think of having a pagination if there is the need for such thing.
+			$file = ResourceFactory::getInstance()->getFileObject($row['uid'], $row);
+			if (!$file->exists()) {
+				$missingFiles[] = $file;
+			}
+		}
+		return $missingFiles;
+	}
+
+	/**
+	 * Deletes all missing files for a given storage.
+	 *
+	 * @param ResourceStorage $storage
+	 * @return array
+	 * @throws \InvalidArgumentException
+	 */
+	public function deleteMissingFiles(ResourceStorage $storage)
+	{
+		/** @var FileReferenceService $fileReferenceService */
+		$fileReferenceService = GeneralUtility::makeInstance(FileReferenceService::class);
+		$missingFiles = $this->searchForMissingFiles($storage);
+		$deletedFiles = [];
+
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+
+		/** @var \TYPO3\CMS\Core\Resource\File $missingFile */
+		foreach ($missingFiles as $missingFile) {
+			try {
+				// if missingFile has no file references
+				if ($missingFile && count($fileReferenceService->findFileReferences($missingFile)) === 0) {
+					// The case is special as we have a missing file in the file system
+					// As a result, we can't use $fileObject->delete(); which will
+					// raise exception "Error while fetching permissions"
+					$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+					$queryBuilder->delete('sys_file')
+						->where($queryBuilder->expr()->eq('uid', $missingFile->getUid()))
+						->execute();
+
+					$deletedFiles[$missingFile->getUid()] = $missingFile->getIdentifier();
+				}
+			} catch (\Exception $e) {
+				continue;
+			}
+		}
+		return $deletedFiles;
+	}
+
+	/*
      * Return duplicates file records
      *
      * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
      * @return array
      */
-    public function searchForDuplicateIdentifiers(ResourceStorage $storage)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )
-            ->groupby('identifier')
-            ->having('count(*) > 1')
-            ->execute();
-
-        // Detect duplicate records.
-        $duplicates = [];
-        while ($row = $statement->fetchAssociative()) {
-
-            $records = $queryBuilder
-                ->select('*')
-                ->from('sys_file')
-                ->where(
-                    $queryBuilder->expr()->eq('storage', $storage->getUid())
-                )
-                ->andWhere(
-                    $queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['identifier']))
-                )
-                ->execute();
-            $records = $records->fetchAllAssociative();
-            $duplicates[$row['identifier']] = $records;
-        }
-        return $duplicates;
-    }
-
-    /**
-     * Return duplicates file records
-     *
-     * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-     * @return array
-     */
-    public function searchForDuplicateSha1(ResourceStorage $storage)
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        $queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
-
-        $statement = $queryBuilder
-            ->select('*')
-            ->from('sys_file')
-            ->where(
-                $queryBuilder->expr()->eq('storage', $storage->getUid())
-            )
-            ->groupby('sha1')
-            ->having('count(*) > 1')
-            ->execute();
-
-        // Detect duplicate records.
-        $duplicates = [];
-        while ($row = $statement->fetchAssociative()) {
-
-            $records = $queryBuilder
-                ->select('*')
-                ->from('sys_file')
-                ->where(
-                    $queryBuilder->expr()->eq('storage', $storage->getUid())
-                )
-                ->andWhere(
-                    $queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['sha1']))
-                )
-                ->execute();
-            $records = $records->fetchAllAssociative();
-            $duplicates[$row['sha1']] = $records;
-        }
-        return $duplicates;
-    }
-
-    /**
-     * @param string $tableName
-     * @return object|QueryBuilder
-     */
-    protected function getQueryBuilder($tableName): QueryBuilder
-    {
-        /** @var ConnectionPool $connectionPool */
-        $connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
-        return $connectionPool->getQueryBuilderForTable($tableName);
-    }
+	public function searchForDuplicateIdentifiers(ResourceStorage $storage)
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)
+			->groupby('identifier')
+			->having('count(*) > 1')
+			->execute();
+
+		// Detect duplicate records.
+		$duplicates = [];
+		while ($row = $statement->fetchAssociative()) {
+
+			$records = $queryBuilder
+				->select('*')
+				->from('sys_file')
+				->where(
+					$queryBuilder->expr()->eq('storage', $storage->getUid())
+				)
+				->andWhere(
+					$queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['identifier']))
+				)
+				->execute();
+			$records = $records->fetchAllAssociative();
+			$duplicates[$row['identifier']] = $records;
+		}
+		return $duplicates;
+	}
+
+	/**
+	 * Return duplicates file records
+	 *
+	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
+	 * @return array
+	 */
+	public function searchForDuplicateSha1(ResourceStorage $storage)
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		$queryBuilder = $connectionPool->getQueryBuilderForTable('sys_file');
+
+		$statement = $queryBuilder
+			->select('*')
+			->from('sys_file')
+			->where(
+				$queryBuilder->expr()->eq('storage', $storage->getUid())
+			)
+			->groupby('sha1')
+			->having('count(*) > 1')
+			->execute();
+
+		// Detect duplicate records.
+		$duplicates = [];
+		while ($row = $statement->fetchAssociative()) {
+
+			$records = $queryBuilder
+				->select('*')
+				->from('sys_file')
+				->where(
+					$queryBuilder->expr()->eq('storage', $storage->getUid())
+				)
+				->andWhere(
+					$queryBuilder->expr()->eq('identifier', $queryBuilder->createNamedParameter($row['sha1']))
+				)
+				->execute();
+			$records = $records->fetchAllAssociative();
+			$duplicates[$row['sha1']] = $records;
+		}
+		return $duplicates;
+	}
+
+	/**
+	 * @param string $tableName
+	 * @return object|QueryBuilder
+	 */
+	protected function getQueryBuilder($tableName): QueryBuilder
+	{
+		/** @var ConnectionPool $connectionPool */
+		$connectionPool = GeneralUtility::makeInstance(ConnectionPool::class);
+		return $connectionPool->getQueryBuilderForTable($tableName);
+	}
 }