fix(StorageService#countFiles): Only count files in eligible mounts and with the correct size

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

Author: marcelklehr

lib/Service/StorageService.php

@@ -54,18 +54,65 @@ public function __construct(
 	 * @throws Exception
 	 */
 	public function countFiles(): int {
+		$totalCount = 0;
+		foreach ($this->getMounts() as $mount) {
+			$totalCount += $this->countFilesInMount($mount['storage_id'], $mount['root_id']);
+		}
+		return $totalCount;
+	}
+
+	/**
+	 * @param int $storageId
+	 * @param int $rootId
+	 * @return int
+	 */
+	public function countFilesInMount(int $storageId, int $rootId): int {
+		$qb = $this->getCacheQueryBuilder();
+		try {
+			$qb->selectFileCache();
+			$qb->andWhere($qb->expr()->eq('filecache.fileid', $qb->createNamedParameter($rootId, IQueryBuilder::PARAM_INT)));
+			$result = $qb->executeQuery();
+			/** @var array{path:string}|false $root */
+			$root = $result->fetch();
+			$result->closeCursor();
+		} catch (Exception $e) {
+			$this->logger->error('Could not fetch storage root', ['exception' => $e]);
+			return 0;
+		}
+
+		if ($root === false) {
+			$this->logger->error('Could not fetch storage root');
+			return 0;
+		}
+
 		$mimeTypes = array_map(fn ($mimeType) => $this->mimeTypes->getId($mimeType), Application::MIMETYPES);
+
 		$qb = $this->getCacheQueryBuilder();
-		$qb->select($qb->func()->count('*'))
-			->from('filecache', 'filecache')
-			->where($qb->expr()->in('mimetype', $qb->createNamedParameter($mimeTypes, IQueryBuilder::PARAM_INT_ARRAY)));
-		$result = $qb->executeQuery();
-		$count = $result->fetchOne();
+
+		try {
+			$path = $root['path'] === '' ? '' : $root['path'] . '/';
+
+			$qb->select($qb->func()->count('*'))
+				->from('filecache', 'filecache');
+			$qb->whereStorageId($storageId);
+			$qb
+				->andWhere($qb->expr()->like('path', $qb->createNamedParameter($path . '%')))
+				->andWhere($qb->expr()->eq('storage', $qb->createNamedParameter($storageId)))
+				->andWhere($qb->expr()->in('mimetype', $qb->createNamedParameter($mimeTypes, IQueryBuilder::PARAM_INT_ARRAY)))
+				->andWhere($qb->expr()->lte('size', $qb->createNamedParameter(Application::CC_MAX_SIZE, IQueryBuilder::PARAM_INT)))
+				->andWhere($qb->expr()->gt('size', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)));
+			$result = $qb->executeQuery();
+		} catch (Exception $e) {
+			$this->logger->error('Could not count files in mount: storage=' . $storageId . ' root=' . $rootId, ['exception' => $e]);
+			return 0;
+		}
+
+		$countInMount = $result->fetchOne();
 		$result->closeCursor();
-		if ($count === false) {
+		if ($countInMount === false) {
 			return 0;
 		}
-		return $count;
+		return $countInMount;
 	}
 
 	/**
@@ -116,17 +163,16 @@ public function getMounts(): \Generator {
 	/**
 	 * @param int $storageId
 	 * @param int $rootId
-	 * @param array $models
 	 * @param int $lastFileId
 	 * @param int $maxResults
 	 * @return \Generator<int,int,mixed,void>
 	 */
 	public function getFilesInMount(int $storageId, int $rootId, int $lastFileId = 0, int $maxResults = 100): \Generator {
 		$qb = $this->getCacheQueryBuilder();
 		try {
-			$result = $qb->selectFileCache()
-				->andWhere($qb->expr()->eq('filecache.fileid', $qb->createNamedParameter($rootId, IQueryBuilder::PARAM_INT)))
-				->executeQuery();
+			$qb->selectFileCache();
+			$qb->andWhere($qb->expr()->eq('filecache.fileid', $qb->createNamedParameter($rootId, IQueryBuilder::PARAM_INT)));
+			$result = $qb->executeQuery();
 			/** @var array{path:string}|false $root */
 			$root = $result->fetch();
 			$result->closeCursor();
@@ -147,8 +193,9 @@ public function getFilesInMount(int $storageId, int $rootId, int $lastFileId = 0
 		try {
 			$path = $root['path'] === '' ? '' : $root['path'] . '/';
 
-			$qb->selectFileCache()
-				->whereStorageId($storageId)
+			$qb->selectFileCache();
+			$qb->whereStorageId($storageId);
+			$qb
 				->andWhere($qb->expr()->like('path', $qb->createNamedParameter($path . '%')))
 				->andWhere($qb->expr()->eq('storage', $qb->createNamedParameter($storageId)))
 				->andWhere($qb->expr()->gt('filecache.fileid', $qb->createNamedParameter($lastFileId)))