-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from derhansen/master
Added 2 new features and a minor improvement
- Loading branch information
Showing
4 changed files
with
174 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| <?php | ||
| namespace WebVision\WvFileCleanup\Service; | ||
|
|
||
| use TYPO3\CMS\Core\Database\Connection; | ||
| use TYPO3\CMS\Core\Database\ConnectionPool; | ||
| use TYPO3\CMS\Core\Resource\File; | ||
| use TYPO3\CMS\Core\Resource\FileCollectionRepository; | ||
| use TYPO3\CMS\Core\Utility\GeneralUtility; | ||
|
|
||
| class FileCollectionService | ||
| { | ||
| /** | ||
| * @var FileCollectionRepository | ||
| */ | ||
| protected $fileCollectionRepository; | ||
|
|
||
| /** | ||
| * Keeps the file uids of all files which are used in file collections of the type "folder" or "category" | ||
| * | ||
| * @var array | ||
| */ | ||
| protected $fileUids = []; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->fileCollectionRepository = GeneralUtility::makeInstance(FileCollectionRepository::class); | ||
| } | ||
|
|
||
| /** | ||
| * Initializes the $fileUids array | ||
| * | ||
| * @param int $storage | ||
| * @param string $folder | ||
| * @throws \TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException | ||
| */ | ||
| public function initialize(int $storage, string $folder) | ||
| { | ||
| $fileCollectionUids = array_unique( | ||
| array_merge( | ||
| $this->getFileCollectionUidsByStorageAndFolder($storage, $folder), | ||
| $this->getFileCollectionUidsForCategoryCollections() | ||
| ) | ||
| ); | ||
|
|
||
| foreach ($fileCollectionUids as $collectionUid) { | ||
| $fileCollection = $this->fileCollectionRepository->findByUid($collectionUid); | ||
| $fileCollection->loadContents(); | ||
|
|
||
| $fileUids = []; | ||
| /** @var File $file */ | ||
| foreach ($fileCollection->getItems() as $file) { | ||
| $fileUids[] = $file->getUid(); | ||
| } | ||
|
|
||
| $this->fileUids = array_unique(array_merge($this->fileUids, $fileUids)); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns, if the given file is used in a FileCollection of the type "folder" or "category" | ||
| * | ||
| * @param File $file | ||
| * @return bool | ||
| */ | ||
| public function isFileCollectionFile(File $file): bool | ||
| { | ||
| return in_array($file->getUid(), $this->fileUids, true); | ||
| } | ||
|
|
||
| private function getFileCollectionUidsByStorageAndFolder(int $storage, string $folder): array | ||
| { | ||
| $connection = GeneralUtility::makeInstance(ConnectionPool::class); | ||
| $queryBuilder = $connection->getQueryBuilderForTable('sys_file_collection'); | ||
| $queryResult = $queryBuilder | ||
| ->select('uid') | ||
| ->from('sys_file_collection') | ||
| ->where( | ||
| $queryBuilder->expr()->eq( | ||
| 'type', | ||
| $queryBuilder->createNamedParameter('folder', Connection::PARAM_STR) | ||
| ), | ||
| $queryBuilder->expr()->eq( | ||
| 'storage', | ||
| $queryBuilder->createNamedParameter($storage, Connection::PARAM_INT) | ||
| ), | ||
| $queryBuilder->expr()->neq( | ||
| 'folder', | ||
| $queryBuilder->createNamedParameter('', Connection::PARAM_STR) | ||
| ), | ||
| $queryBuilder->expr()->like( | ||
| 'folder', | ||
| $queryBuilder->createNamedParameter( | ||
| $queryBuilder->escapeLikeWildcards($folder) . '%', | ||
| Connection::PARAM_STR | ||
| ) | ||
| ) | ||
| ) | ||
| ->execute() | ||
| ->fetchAll(); | ||
|
|
||
| $result = []; | ||
| foreach ($queryResult as $record) { | ||
| $result[] = $record['uid']; | ||
| } | ||
|
|
||
| return $result; | ||
| } | ||
|
|
||
| private function getFileCollectionUidsForCategoryCollections(): array | ||
| { | ||
| $connection = GeneralUtility::makeInstance(ConnectionPool::class); | ||
| $queryBuilder = $connection->getQueryBuilderForTable('sys_file_collection'); | ||
| $queryResult = $queryBuilder | ||
| ->select('uid') | ||
| ->from('sys_file_collection') | ||
| ->where( | ||
| $queryBuilder->expr()->eq( | ||
| 'type', | ||
| $queryBuilder->createNamedParameter('category', Connection::PARAM_STR) | ||
| ) | ||
| ) | ||
| ->execute() | ||
| ->fetchAll(); | ||
|
|
||
| $result = []; | ||
| foreach ($queryResult as $record) { | ||
| $result[] = $record['uid']; | ||
| } | ||
|
|
||
| return $result; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| # cat=settings; type=string; label= LLL:EXT:wv_file_cleanup/Resources/Private/Language/locallang_mod_cleanup.xml:ext_conf.fileNameDenyPattern | ||
| fileNameDenyPattern = /index.html/i | ||
|
|
||
| # cat=settings; type=string; label= LLL:EXT:wv_file_cleanup/Resources/Private/Language/locallang_mod_cleanup.xml:ext_conf.pathDenyPattern | ||
| pathDenyPattern = |