From c8138002ab81418ce6f29c7a71b5da62849e7142 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Fri, 16 May 2025 11:57:47 +0200 Subject: [PATCH] chore(files): remove dead code from files helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Its not used anywhere and uses deprecated / legacy API. Lets remove 🧹 Signed-off-by: Ferdinand Thiessen --- apps/files/lib/Helper.php | 105 -------------------------------- apps/files/tests/HelperTest.php | 34 ----------- 2 files changed, 139 deletions(-) diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php index 82d1cc94934..b1439ac7fa5 100644 --- a/apps/files/lib/Helper.php +++ b/apps/files/lib/Helper.php @@ -9,66 +9,12 @@ namespace OCA\Files; use OC\Files\Filesystem; use OCP\Files\FileInfo; -use OCP\Files\IMimeTypeDetector; -use OCP\Files\NotFoundException; -use OCP\ITagManager; -use OCP\Server; use OCP\Util; /** * Helper class for manipulating file information */ class Helper { - /** - * @param string $dir - * @return array - * @throws NotFoundException - */ - public static function buildFileStorageStatistics($dir) { - // information about storage capacities - $storageInfo = \OC_Helper::getStorageInfo($dir); - $l = Util::getL10N('files'); - $maxUploadFileSize = Util::maxUploadFilesize($dir, $storageInfo['free']); - $maxHumanFileSize = Util::humanFileSize($maxUploadFileSize); - $maxHumanFileSize = $l->t('Upload (max. %s)', [$maxHumanFileSize]); - - return [ - 'uploadMaxFilesize' => $maxUploadFileSize, - 'maxHumanFilesize' => $maxHumanFileSize, - 'freeSpace' => $storageInfo['free'], - 'quota' => $storageInfo['quota'], - 'total' => $storageInfo['total'], - 'used' => $storageInfo['used'], - 'usedSpacePercent' => $storageInfo['relative'], - 'owner' => $storageInfo['owner'], - 'ownerDisplayName' => $storageInfo['ownerDisplayName'], - 'mountType' => $storageInfo['mountType'], - 'mountPoint' => $storageInfo['mountPoint'], - ]; - } - - /** - * Determine icon for a given file - * - * @param FileInfo $file file info - * @return string icon URL - */ - public static function determineIcon($file) { - if ($file['type'] === 'dir') { - $icon = Server::get(IMimeTypeDetector::class)->mimeTypeIcon('dir'); - // TODO: move this part to the client side, using mountType - if ($file->isShared()) { - $icon = Server::get(IMimeTypeDetector::class)->mimeTypeIcon('dir-shared'); - } elseif ($file->isMounted()) { - $icon = Server::get(IMimeTypeDetector::class)->mimeTypeIcon('dir-external'); - } - } else { - $icon = Server::get(IMimeTypeDetector::class)->mimeTypeIcon($file->getMimetype()); - } - - return substr($icon, 0, -3) . 'svg'; - } - /** * Comparator function to sort files alphabetically and have * the directories appear first @@ -161,20 +107,6 @@ class Helper { return $entry; } - /** - * Format file info for JSON - * @param FileInfo[] $fileInfos file infos - * @return array - */ - public static function formatFileInfos($fileInfos) { - $files = []; - foreach ($fileInfos as $i) { - $files[] = self::formatFileInfo($i); - } - - return $files; - } - /** * Retrieves the contents of the given directory and * returns it as a sorted array of FileInfo. @@ -191,43 +123,6 @@ class Helper { return self::sortFiles($content, $sortAttribute, $sortDescending); } - /** - * Populate the result set with file tags - * - * @psalm-template T of array{tags?: list, file_source: int, ...array} - * @param list $fileList - * @return list file list populated with tags - */ - public static function populateTags(array $fileList, ITagManager $tagManager) { - $tagger = $tagManager->load('files'); - $tags = $tagger->getTagsForObjects(array_map(static fn (array $fileData) => $fileData['file_source'], $fileList)); - - if (!is_array($tags)) { - throw new \UnexpectedValueException('$tags must be an array'); - } - - // Set empty tag array - foreach ($fileList as &$fileData) { - $fileData['tags'] = []; - } - unset($fileData); - - if (!empty($tags)) { - foreach ($tags as $fileId => $fileTags) { - foreach ($fileList as &$fileData) { - if ($fileId !== $fileData['file_source']) { - continue; - } - - $fileData['tags'] = $fileTags; - } - unset($fileData); - } - } - - return $fileList; - } - /** * Sort the given file info array * diff --git a/apps/files/tests/HelperTest.php b/apps/files/tests/HelperTest.php index 0cf2812f816..5900e94215c 100644 --- a/apps/files/tests/HelperTest.php +++ b/apps/files/tests/HelperTest.php @@ -2,8 +2,6 @@ use OC\Files\FileInfo; use OCA\Files\Helper; -use OCP\ITagManager; -use OCP\ITags; /** * SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors @@ -94,36 +92,4 @@ class HelperTest extends \Test\TestCase { $fileNames ); } - - public function testPopulateTags(): void { - $tagManager = $this->createMock(ITagManager::class); - $tagger = $this->createMock(ITags::class); - - $tagManager->method('load') - ->with('files') - ->willReturn($tagger); - - $data = [ - ['file_source' => 10], - ['file_source' => 22, 'foo' => 'bar'], - ['file_source' => 42, 'x' => 'y'], - ]; - - $tags = [ - 10 => ['tag3'], - 42 => ['tag1', 'tag2'], - ]; - - $tagger->method('getTagsForObjects') - ->with([10, 22, 42]) - ->willReturn($tags); - - $result = Helper::populateTags($data, $tagManager); - - $this->assertSame([ - ['file_source' => 10, 'tags' => ['tag3']], - ['file_source' => 22, 'foo' => 'bar', 'tags' => []], - ['file_source' => 42, 'x' => 'y', 'tags' => ['tag1', 'tag2']], - ], $result); - } }