Fix Error "File with ID xyz not found, skipping: " while scanning groupfolder versions during #255

Author: ata-no-one

lib/Db/DbFileMapper.php

@@ -69,6 +69,7 @@ public function getFileIdsWithoutTags(array $excludedTagIds, int $limit, int $of
 				$qb->expr()->like('f.path', $qb->createNamedParameter('files/%')),
 				$qb->expr()->like('f.path', $qb->createNamedParameter('__groupfolders/%'))
 			))
+			->andWhere($qb->expr()->notLike('f.path', $qb->createNamedParameter('__groupfolders/versions/%')))
 			->orderBy('f.fileid', 'DESC')
 			->setFirstResult($offset)
 			->setMaxResults($limit);
@@ -107,6 +108,7 @@ public function getFileIdsWithTags(array $includedTagIds, int $limit, int $offse
 				$qb->expr()->like('f.path', $qb->createNamedParameter('files/%')),
 				$qb->expr()->like('f.path', $qb->createNamedParameter('__groupfolders/%'))
 			))
+			->andWhere($qb->expr()->notLike('f.path', $qb->createNamedParameter('__groupfolders/versions/%')))
 			->orderBy('f.fileid', 'DESC')
 			->setFirstResult($offset)
 			->setMaxResults($limit);
@@ -138,7 +140,9 @@ public function getFilesCount(): int {
 			->andWhere($fileQuery->expr()->orX(
 				$fileQuery->expr()->like('f.path', $fileQuery->createNamedParameter('files/%')),
 				$fileQuery->expr()->like('f.path', $fileQuery->createNamedParameter('__groupfolders/%'))
-			));
+			))
+			->andWhere($fileQuery->expr()->notLike('f.path', $fileQuery->createNamedParameter('__groupfolders/versions/%')));
+
 
 		$storageQuery = $this->db->getQueryBuilder();
 		$storageQuery->selectAlias('numeric_id', 'id')

lib/Service/ScanService.php

@@ -132,7 +132,7 @@ private function getFileIdsToScan(): array {
 						$this->logger->debug("File with ID $fileId is not readable or not allowed to scan, skipping.");
 					}
 				} catch (NotFoundException $e) {
-					$this->logger->error("File with ID $fileId not found, skipping: " . $e->getMessage());
+					$this->logger->error("File with ID $fileId not found, skipping: " . $e->getMessage(), ['exception' => $e]);
 				} catch (NotPermittedException $e) {
 					$this->logger->error(
 						"Current settings do not permit scanning file with ID $fileId, skipping: " . $e->getMessage()