nextcloud / server

lib/private/Repair/RepairInvalidShares.php

Indentation +64 added lines, -64 removed lines

@@ -16,80 +16,80 @@
  * Repairs shares with invalid data
  */
 class RepairInvalidShares implements IRepairStep {
-	public const CHUNK_SIZE = 200;
+    public const CHUNK_SIZE = 200;
 
-	public function __construct(
-		protected IConfig $config,
-		protected IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        protected IConfig $config,
+        protected IDBConnection $connection,
+    ) {
+    }
 
-	public function getName() {
-		return 'Repair invalid shares';
-	}
+    public function getName() {
+        return 'Repair invalid shares';
+    }
 
-	/**
-	 * Adjust file share permissions
-	 */
-	private function adjustFileSharePermissions(IOutput $output): void {
-		$mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
-		$builder = $this->connection->getQueryBuilder();
+    /**
+     * Adjust file share permissions
+     */
+    private function adjustFileSharePermissions(IOutput $output): void {
+        $mask = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE;
+        $builder = $this->connection->getQueryBuilder();
 
-		$permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
-		$builder
-			->update('share')
-			->set('permissions', $permsFunc)
-			->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
-			->andWhere($builder->expr()->neq('permissions', $permsFunc));
+        $permsFunc = $builder->expr()->bitwiseAnd('permissions', $mask);
+        $builder
+            ->update('share')
+            ->set('permissions', $permsFunc)
+            ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
+            ->andWhere($builder->expr()->neq('permissions', $permsFunc));
 
-		$updatedEntries = $builder->executeStatement();
-		if ($updatedEntries > 0) {
-			$output->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
-		}
-	}
+        $updatedEntries = $builder->executeStatement();
+        if ($updatedEntries > 0) {
+            $output->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+        }
+    }
 
-	/**
-	 * Remove shares where the parent share does not exist anymore
-	 */
-	private function removeSharesNonExistingParent(IOutput $output): void {
-		$deletedEntries = 0;
+    /**
+     * Remove shares where the parent share does not exist anymore
+     */
+    private function removeSharesNonExistingParent(IOutput $output): void {
+        $deletedEntries = 0;
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('s1.parent')
-			->from('share', 's1')
-			->where($query->expr()->isNotNull('s1.parent'))
-			->andWhere($query->expr()->isNull('s2.id'))
-			->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
-			->groupBy('s1.parent')
-			->setMaxResults(self::CHUNK_SIZE);
+        $query = $this->connection->getQueryBuilder();
+        $query->select('s1.parent')
+            ->from('share', 's1')
+            ->where($query->expr()->isNotNull('s1.parent'))
+            ->andWhere($query->expr()->isNull('s2.id'))
+            ->leftJoin('s1', 'share', 's2', $query->expr()->eq('s1.parent', 's2.id'))
+            ->groupBy('s1.parent')
+            ->setMaxResults(self::CHUNK_SIZE);
 
-		$deleteQuery = $this->connection->getQueryBuilder();
-		$deleteQuery->delete('share')
-			->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
+        $deleteQuery = $this->connection->getQueryBuilder();
+        $deleteQuery->delete('share')
+            ->where($deleteQuery->expr()->eq('parent', $deleteQuery->createParameter('parent')));
 
-		$deletedInLastChunk = self::CHUNK_SIZE;
-		while ($deletedInLastChunk === self::CHUNK_SIZE) {
-			$deletedInLastChunk = 0;
-			$result = $query->executeQuery();
-			while ($row = $result->fetch()) {
-				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int)$row['parent'])
-					->executeStatement();
-			}
-			$result->closeCursor();
-		}
+        $deletedInLastChunk = self::CHUNK_SIZE;
+        while ($deletedInLastChunk === self::CHUNK_SIZE) {
+            $deletedInLastChunk = 0;
+            $result = $query->executeQuery();
+            while ($row = $result->fetch()) {
+                $deletedInLastChunk++;
+                $deletedEntries += $deleteQuery->setParameter('parent', (int)$row['parent'])
+                    ->executeStatement();
+            }
+            $result->closeCursor();
+        }
 
-		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
-		}
-	}
+        if ($deletedEntries) {
+            $output->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+        }
+    }
 
-	public function run(IOutput $output) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
-			$this->adjustFileSharePermissions($output);
-		}
+    public function run(IOutput $output) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValueString('version', '0.0.0');
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.11', '<')) {
+            $this->adjustFileSharePermissions($output);
+        }
 
-		$this->removeSharesNonExistingParent($output);
-	}
+        $this->removeSharesNonExistingParent($output);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -44,7 +44,7 @@ 
 
 		$updatedEntries = $builder->executeStatement();
 		if ($updatedEntries > 0) {
-			$output->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
+			$output->info('Fixed file share permissions for '.$updatedEntries.' shares');
 		}
 	}
 
@@ -73,14 +73,14 @@ 
 			$result = $query->executeQuery();
 			while ($row = $result->fetch()) {
 				$deletedInLastChunk++;
-				$deletedEntries += $deleteQuery->setParameter('parent', (int)$row['parent'])
+				$deletedEntries += $deleteQuery->setParameter('parent', (int) $row['parent'])
 					->executeStatement();
 			}
 			$result->closeCursor();
 		}
 
 		if ($deletedEntries) {
-			$output->info('Removed ' . $deletedEntries . ' shares where the parent did not exist');
+			$output->info('Removed '.$deletedEntries.' shares where the parent did not exist');
 		}
 	}
 

lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php

Indentation +59 added lines, -59 removed lines

@@ -19,73 +19,73 @@
 use Psr\Log\LoggerInterface;
 
 class CleanPreviewsBackgroundJob extends QueuedJob {
-	public function __construct(
-		private IRootFolder $rootFolder,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		ITimeFactory $timeFactory,
-		private IUserManager $userManager,
-	) {
-		parent::__construct($timeFactory);
-	}
+    public function __construct(
+        private IRootFolder $rootFolder,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        ITimeFactory $timeFactory,
+        private IUserManager $userManager,
+    ) {
+        parent::__construct($timeFactory);
+    }
 
-	public function run($argument): void {
-		$uid = $argument['uid'];
-		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
-			return;
-		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
-		$empty = $this->cleanupPreviews($uid);
+    public function run($argument): void {
+        $uid = $argument['uid'];
+        if (!$this->userManager->userExists($uid)) {
+            $this->logger->info('User no longer exists, skip user ' . $uid);
+            return;
+        }
+        $this->logger->info('Started preview cleanup for ' . $uid);
+        $empty = $this->cleanupPreviews($uid);
 
-		if (!$empty) {
-			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
-		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
-		}
-	}
+        if (!$empty) {
+            $this->jobList->add(self::class, ['uid' => $uid]);
+            $this->logger->info('New preview cleanup scheduled for ' . $uid);
+        } else {
+            $this->logger->info('Preview cleanup done for ' . $uid);
+        }
+    }
 
-	/**
-	 * @param string $uid
-	 */
-	private function cleanupPreviews($uid): bool {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($uid);
-		} catch (NotFoundException $e) {
-			return true;
-		}
+    /**
+     * @param string $uid
+     */
+    private function cleanupPreviews($uid): bool {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($uid);
+        } catch (NotFoundException $e) {
+            return true;
+        }
 
-		$userRoot = $userFolder->getParent();
+        $userRoot = $userFolder->getParent();
 
-		try {
-			/** @var Folder $thumbnailFolder */
-			$thumbnailFolder = $userRoot->get('thumbnails');
-		} catch (NotFoundException $e) {
-			return true;
-		}
+        try {
+            /** @var Folder $thumbnailFolder */
+            $thumbnailFolder = $userRoot->get('thumbnails');
+        } catch (NotFoundException $e) {
+            return true;
+        }
 
-		$thumbnails = $thumbnailFolder->getDirectoryListing();
+        $thumbnails = $thumbnailFolder->getDirectoryListing();
 
-		$start = $this->time->getTime();
-		foreach ($thumbnails as $thumbnail) {
-			try {
-				$thumbnail->delete();
-			} catch (NotPermittedException $e) {
-				// Ignore
-			}
+        $start = $this->time->getTime();
+        foreach ($thumbnails as $thumbnail) {
+            try {
+                $thumbnail->delete();
+            } catch (NotPermittedException $e) {
+                // Ignore
+            }
 
-			if (($this->time->getTime() - $start) > 15) {
-				return false;
-			}
-		}
+            if (($this->time->getTime() - $start) > 15) {
+                return false;
+            }
+        }
 
-		try {
-			$thumbnailFolder->delete();
-		} catch (NotPermittedException $e) {
-			// Ignore
-		}
+        try {
+            $thumbnailFolder->delete();
+        } catch (NotPermittedException $e) {
+            // Ignore
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -32,17 +32,17 @@
 	public function run($argument): void {
 		$uid = $argument['uid'];
 		if (!$this->userManager->userExists($uid)) {
-			$this->logger->info('User no longer exists, skip user ' . $uid);
+			$this->logger->info('User no longer exists, skip user '.$uid);
 			return;
 		}
-		$this->logger->info('Started preview cleanup for ' . $uid);
+		$this->logger->info('Started preview cleanup for '.$uid);
 		$empty = $this->cleanupPreviews($uid);
 
 		if (!$empty) {
 			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
+			$this->logger->info('New preview cleanup scheduled for '.$uid);
 		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
+			$this->logger->info('Preview cleanup done for '.$uid);
 		}
 	}
 

lib/private/Repair/Owncloud/MoveAvatarsBackgroundJob.php

Indentation +64 added lines, -64 removed lines

@@ -20,76 +20,76 @@
 use function is_resource;
 
 class MoveAvatarsBackgroundJob extends QueuedJob {
-	private ?IStorage $owncloudAvatarStorage = null;
+    private ?IStorage $owncloudAvatarStorage = null;
 
-	public function __construct(
-		private IUserManager $userManager,
-		private LoggerInterface $logger,
-		private IAvatarManager $avatarManager,
-		private IRootFolder $rootFolder,
-		ITimeFactory $time,
-	) {
-		parent::__construct($time);
-		try {
-			$this->owncloudAvatarStorage = $rootFolder->get('avatars')->getStorage();
-		} catch (\Exception $e) {
-		}
-	}
+    public function __construct(
+        private IUserManager $userManager,
+        private LoggerInterface $logger,
+        private IAvatarManager $avatarManager,
+        private IRootFolder $rootFolder,
+        ITimeFactory $time,
+    ) {
+        parent::__construct($time);
+        try {
+            $this->owncloudAvatarStorage = $rootFolder->get('avatars')->getStorage();
+        } catch (\Exception $e) {
+        }
+    }
 
-	public function run($argument) {
-		$this->logger->info('Started migrating avatars to AppData folder');
-		$this->moveAvatars();
-		$this->logger->info('All avatars migrated to AppData folder');
-	}
+    public function run($argument) {
+        $this->logger->info('Started migrating avatars to AppData folder');
+        $this->moveAvatars();
+        $this->logger->info('All avatars migrated to AppData folder');
+    }
 
-	private function moveAvatars(): void {
-		if (!$this->owncloudAvatarStorage) {
-			$this->logger->info('No legacy avatars available, skipping migration');
-			return;
-		}
+    private function moveAvatars(): void {
+        if (!$this->owncloudAvatarStorage) {
+            $this->logger->info('No legacy avatars available, skipping migration');
+            return;
+        }
 
-		$counter = 0;
-		$this->userManager->callForSeenUsers(function (IUser $user) use (&$counter) {
-			$uid = $user->getUID();
+        $counter = 0;
+        $this->userManager->callForSeenUsers(function (IUser $user) use (&$counter) {
+            $uid = $user->getUID();
 
-			$path = 'avatars/' . $this->buildOwnCloudAvatarPath($uid);
-			$avatar = $this->avatarManager->getAvatar($uid);
-			try {
-				$avatarPath = $path . '/avatar.' . $this->getExtension($path);
-				$resource = $this->owncloudAvatarStorage->fopen($avatarPath, 'r');
-				if (is_resource($resource)) {
-					$avatar->set($resource);
-					fclose($resource);
-				} else {
-					throw new \Exception('Failed to open old avatar file for reading');
-				}
-			} catch (NotFoundException $e) {
-				// In case there is no avatar we can just skip
-			} catch (\Throwable $e) {
-				$this->logger->error('Failed to migrate avatar for user ' . $uid, ['exception' => $e]);
-			}
+            $path = 'avatars/' . $this->buildOwnCloudAvatarPath($uid);
+            $avatar = $this->avatarManager->getAvatar($uid);
+            try {
+                $avatarPath = $path . '/avatar.' . $this->getExtension($path);
+                $resource = $this->owncloudAvatarStorage->fopen($avatarPath, 'r');
+                if (is_resource($resource)) {
+                    $avatar->set($resource);
+                    fclose($resource);
+                } else {
+                    throw new \Exception('Failed to open old avatar file for reading');
+                }
+            } catch (NotFoundException $e) {
+                // In case there is no avatar we can just skip
+            } catch (\Throwable $e) {
+                $this->logger->error('Failed to migrate avatar for user ' . $uid, ['exception' => $e]);
+            }
 
-			$counter++;
-			if ($counter % 100 === 0) {
-				$this->logger->info('{amount} avatars migrated', ['amount' => $counter]);
-			}
-		});
-	}
+            $counter++;
+            if ($counter % 100 === 0) {
+                $this->logger->info('{amount} avatars migrated', ['amount' => $counter]);
+            }
+        });
+    }
 
-	/**
-	 * @throws NotFoundException
-	 */
-	private function getExtension(string $path): string {
-		if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.jpg")) {
-			return 'jpg';
-		}
-		if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.png")) {
-			return 'png';
-		}
-		throw new NotFoundException("{$path}/avatar.jpg|png");
-	}
+    /**
+     * @throws NotFoundException
+     */
+    private function getExtension(string $path): string {
+        if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.jpg")) {
+            return 'jpg';
+        }
+        if ($this->owncloudAvatarStorage->file_exists("{$path}/avatar.png")) {
+            return 'png';
+        }
+        throw new NotFoundException("{$path}/avatar.jpg|png");
+    }
 
-	protected function buildOwnCloudAvatarPath(string $userId): string {
-		return substr_replace(substr_replace(md5($userId), '/', 4, 0), '/', 2, 0);
-	}
+    protected function buildOwnCloudAvatarPath(string $userId): string {
+        return substr_replace(substr_replace(md5($userId), '/', 4, 0), '/', 2, 0);
+    }
 }

lib/private/Repair/RepairMimeTypes.php

Indentation +469 added lines, -469 removed lines

@@ -17,473 +17,473 @@
 use OCP\Migration\IRepairStep;
 
 class RepairMimeTypes implements IRepairStep {
-	private bool $dryRun = false;
-	private int $changeCount = 0;
-
-	/** @var int */
-	protected int $folderMimeTypeId;
-
-	public function __construct(
-		protected IConfig $config,
-		protected IAppConfig $appConfig,
-		protected IDBConnection $connection,
-	) {
-	}
-
-	public function getName(): string {
-		return 'Repair mime types';
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	private function updateMimetypes($updatedMimetypes): IResult|int|null {
-		if ($this->dryRun) {
-			$this->changeCount += count($updatedMimetypes);
-			return null;
-		}
-
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('mimetypes')
-			->where($query->expr()->eq('mimetype', $query->createParameter('mimetype'), IQueryBuilder::PARAM_INT));
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('mimetypes')
-			->setValue('mimetype', $insert->createParameter('mimetype'));
-
-		if (empty($this->folderMimeTypeId)) {
-			$query->setParameter('mimetype', 'httpd/unix-directory');
-			$result = $query->execute();
-			$this->folderMimeTypeId = (int)$result->fetchOne();
-			$result->closeCursor();
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('filecache')
-			->runAcrossAllShards()
-			->set('mimetype', $update->createParameter('mimetype'))
-			->where($update->expr()->neq('mimetype', $update->createParameter('mimetype'), IQueryBuilder::PARAM_INT))
-			->andWhere($update->expr()->neq('mimetype', $update->createParameter('folder'), IQueryBuilder::PARAM_INT))
-			->andWhere($update->expr()->iLike('name', $update->createParameter('name')))
-			->setParameter('folder', $this->folderMimeTypeId);
-
-		$count = 0;
-		foreach ($updatedMimetypes as $extension => $mimetype) {
-			// get target mimetype id
-			$query->setParameter('mimetype', $mimetype);
-			$result = $query->execute();
-			$mimetypeId = (int)$result->fetchOne();
-			$result->closeCursor();
-
-			if (!$mimetypeId) {
-				// insert mimetype
-				$insert->setParameter('mimetype', $mimetype);
-				$insert->execute();
-				$mimetypeId = $insert->getLastInsertId();
-			}
-
-			// change mimetype for files with x extension
-			$update->setParameter('mimetype', $mimetypeId)
-				->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
-			$count += $update->execute();
-		}
-
-		return $count;
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 12.0.0.14
-	 */
-	private function introduceImageTypes(): IResult|int|null {
-		$updatedMimetypes = [
-			'jp2' => 'image/jp2',
-			'webp' => 'image/webp',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 12.0.0.13
-	 */
-	private function introduceWindowsProgramTypes(): IResult|int|null {
-		$updatedMimetypes = [
-			'htaccess' => 'text/plain',
-			'bat' => 'application/x-msdos-program',
-			'cmd' => 'application/cmd',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 13.0.0.0
-	 */
-	private function introduceLocationTypes(): IResult|int|null {
-		$updatedMimetypes = [
-			'gpx' => 'application/gpx+xml',
-			'kml' => 'application/vnd.google-earth.kml+xml',
-			'kmz' => 'application/vnd.google-earth.kmz',
-			'tcx' => 'application/vnd.garmin.tcx+xml',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 13.0.0.3
-	 */
-	private function introduceInternetShortcutTypes(): IResult|int|null {
-		$updatedMimetypes = [
-			'url' => 'application/internet-shortcut',
-			'webloc' => 'application/internet-shortcut'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 13.0.0.6
-	 */
-	private function introduceStreamingTypes(): IResult|int|null {
-		$updatedMimetypes = [
-			'm3u' => 'audio/mpegurl',
-			'm3u8' => 'audio/mpegurl',
-			'pls' => 'audio/x-scpls'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 14.0.0.8
-	 */
-	private function introduceVisioTypes(): IResult|int|null {
-		$updatedMimetypes = [
-			'vsdm' => 'application/vnd.visio',
-			'vsdx' => 'application/vnd.visio',
-			'vssm' => 'application/vnd.visio',
-			'vssx' => 'application/vnd.visio',
-			'vstm' => 'application/vnd.visio',
-			'vstx' => 'application/vnd.visio',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 14.0.0.10
-	 */
-	private function introduceComicbookTypes(): IResult|int|null {
-		$updatedMimetypes = [
-			'cb7' => 'application/comicbook+7z',
-			'cba' => 'application/comicbook+ace',
-			'cbr' => 'application/comicbook+rar',
-			'cbt' => 'application/comicbook+tar',
-			'cbtc' => 'application/comicbook+truecrypt',
-			'cbz' => 'application/comicbook+zip',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 20.0.0.5
-	 */
-	private function introduceOpenDocumentTemplates(): IResult|int|null {
-		$updatedMimetypes = [
-			'ott' => 'application/vnd.oasis.opendocument.text-template',
-			'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
-			'otp' => 'application/vnd.oasis.opendocument.presentation-template',
-			'otg' => 'application/vnd.oasis.opendocument.graphics-template',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 21.0.0.7
-	 */
-	private function introduceOrgModeType(): IResult|int|null {
-		$updatedMimetypes = [
-			'org' => 'text/org'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 23.0.0.2
-	 */
-	private function introduceFlatOpenDocumentType(): IResult|int|null {
-		$updatedMimetypes = [
-			'fodt' => 'application/vnd.oasis.opendocument.text-flat-xml',
-			'fods' => 'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
-			'fodg' => 'application/vnd.oasis.opendocument.graphics-flat-xml',
-			'fodp' => 'application/vnd.oasis.opendocument.presentation-flat-xml',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 25.0.0.2
-	 */
-	private function introduceOnlyofficeFormType(): IResult|int|null {
-		$updatedMimetypes = [
-			'oform' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform',
-			'docxf' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 26.0.0.1
-	 */
-	private function introduceAsciidocType(): IResult|int|null {
-		$updatedMimetypes = [
-			'adoc' => 'text/asciidoc',
-			'asciidoc' => 'text/asciidoc',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 28.0.0.5
-	 */
-	private function introduceEnhancedMetafileFormatType(): IResult|int|null {
-		$updatedMimetypes = [
-			'emf' => 'image/emf',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 29.0.0.2
-	 */
-	private function introduceEmlAndMsgFormatType(): IResult|int|null {
-		$updatedMimetypes = [
-			'eml' => 'message/rfc822',
-			'msg' => 'application/vnd.ms-outlook',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 29.0.0.6
-	 */
-	private function introduceAacAudioType(): IResult|int|null {
-		$updatedMimetypes = [
-			'aac' => 'audio/aac',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 29.0.10
-	 */
-	private function introduceReStructuredTextFormatType(): IResult|int|null {
-		$updatedMimetypes = [
-			'rst' => 'text/x-rst',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 30.0.0
-	 */
-	private function introduceExcalidrawType(): IResult|int|null {
-		$updatedMimetypes = [
-			'excalidraw' => 'application/vnd.excalidraw+json',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-
-	/**
-	 * @throws Exception
-	 * @since 31.0.0
-	 */
-	private function introduceZstType(): IResult|int|null {
-		$updatedMimetypes = [
-			'zst' => 'application/zstd',
-			'nfo' => 'text/x-nfo',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 32.0.0
-	 */
-	private function introduceMusicxmlType(): IResult|int|null {
-		$updatedMimetypes = [
-			'mxl' => 'application/vnd.recordare.musicxml',
-			'musicxml' => 'application/vnd.recordare.musicxml+xml',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * @throws Exception
-	 * @since 32.0.0
-	 */
-	private function introduceTextType(): IResult|int|null {
-		$updatedMimetypes = [
-			'text' => 'text/plain',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-
-
-	/**
-	 * Check if there are any migrations available
-	 *
-	 * @throws Exception
-	 */
-	public function migrationsAvailable(): bool {
-		$this->dryRun = true;
-		$this->run(new NullOutput());
-		$this->dryRun = false;
-		return $this->changeCount > 0;
-	}
-
-	/**
-	 * Get the current mimetype version
-	 */
-	private function getMimeTypeVersion(): string {
-		$serverVersion = $this->config->getSystemValueString('version', '0.0.0');
-		// 29.0.0.10 is the last version with a mimetype migration before it was moved to a separate version number
-		if (version_compare($serverVersion, '29.0.0.10', '>')) {
-			return $this->appConfig->getValueString('files', 'mimetype_version', '29.0.0.10');
-		}
-
-		return $serverVersion;
-	}
-
-	/**
-	 * Fix mime types
-	 *
-	 * @throws Exception
-	 */
-	public function run(IOutput $output): void {
-		$serverVersion = $this->config->getSystemValueString('version', '0.0.0');
-		$mimeTypeVersion = $this->getMimeTypeVersion();
-
-		// NOTE TO DEVELOPERS: when adding new mime types, please make sure to
-		// add a version comparison to avoid doing it every time
-		// PLEASE ALSO KEEP THE LIST SORTED BY VERSION NUMBER
-
-		if (version_compare($mimeTypeVersion, '12.0.0.14', '<') && $this->introduceImageTypes()) {
-			$output->info('Fixed image mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
-			$output->info('Fixed windows program mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
-			$output->info('Fixed geospatial mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
-			$output->info('Fixed internet-shortcut mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
-			$output->info('Fixed streaming mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
-			$output->info('Fixed visio mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
-			$output->info('Fixed comicbook mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
-			$output->info('Fixed OpenDocument template mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '21.0.0.7', '<') && $this->introduceOrgModeType()) {
-			$output->info('Fixed orgmode mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '23.0.0.2', '<') && $this->introduceFlatOpenDocumentType()) {
-			$output->info('Fixed Flat OpenDocument mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '25.0.0.2', '<') && $this->introduceOnlyofficeFormType()) {
-			$output->info('Fixed ONLYOFFICE Forms OpenXML mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '26.0.0.1', '<') && $this->introduceAsciidocType()) {
-			$output->info('Fixed AsciiDoc mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '28.0.0.5', '<') && $this->introduceEnhancedMetafileFormatType()) {
-			$output->info('Fixed Enhanced Metafile Format mime types');
-		}
-
-		if (version_compare($mimeTypeVersion, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) {
-			$output->info('Fixed eml and msg mime type');
-		}
-
-		if (version_compare($mimeTypeVersion, '29.0.0.6', '<') && $this->introduceAacAudioType()) {
-			$output->info('Fixed aac mime type');
-		}
-
-		if (version_compare($mimeTypeVersion, '29.0.0.10', '<') && $this->introduceReStructuredTextFormatType()) {
-			$output->info('Fixed ReStructured Text mime type');
-		}
-
-		if (version_compare($mimeTypeVersion, '30.0.0.0', '<') && $this->introduceExcalidrawType()) {
-			$output->info('Fixed Excalidraw mime type');
-		}
-
-		if (version_compare($mimeTypeVersion, '31.0.0.0', '<') && $this->introduceZstType()) {
-			$output->info('Fixed zst mime type');
-		}
-
-		if (version_compare($mimeTypeVersion, '32.0.0.0', '<') && $this->introduceMusicxmlType()) {
-			$output->info('Fixed musicxml mime type');
-		}
-
-		if (version_compare($mimeTypeVersion, '32.0.0.0', '<') && $this->introduceTextType()) {
-			$out->info('Fixed text mime type');
-		}
-
-		if (!$this->dryRun) {
-			$this->appConfig->setValueString('files', 'mimetype_version', $serverVersion);
-		}
-	}
+    private bool $dryRun = false;
+    private int $changeCount = 0;
+
+    /** @var int */
+    protected int $folderMimeTypeId;
+
+    public function __construct(
+        protected IConfig $config,
+        protected IAppConfig $appConfig,
+        protected IDBConnection $connection,
+    ) {
+    }
+
+    public function getName(): string {
+        return 'Repair mime types';
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function updateMimetypes($updatedMimetypes): IResult|int|null {
+        if ($this->dryRun) {
+            $this->changeCount += count($updatedMimetypes);
+            return null;
+        }
+
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('mimetypes')
+            ->where($query->expr()->eq('mimetype', $query->createParameter('mimetype'), IQueryBuilder::PARAM_INT));
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('mimetypes')
+            ->setValue('mimetype', $insert->createParameter('mimetype'));
+
+        if (empty($this->folderMimeTypeId)) {
+            $query->setParameter('mimetype', 'httpd/unix-directory');
+            $result = $query->execute();
+            $this->folderMimeTypeId = (int)$result->fetchOne();
+            $result->closeCursor();
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('filecache')
+            ->runAcrossAllShards()
+            ->set('mimetype', $update->createParameter('mimetype'))
+            ->where($update->expr()->neq('mimetype', $update->createParameter('mimetype'), IQueryBuilder::PARAM_INT))
+            ->andWhere($update->expr()->neq('mimetype', $update->createParameter('folder'), IQueryBuilder::PARAM_INT))
+            ->andWhere($update->expr()->iLike('name', $update->createParameter('name')))
+            ->setParameter('folder', $this->folderMimeTypeId);
+
+        $count = 0;
+        foreach ($updatedMimetypes as $extension => $mimetype) {
+            // get target mimetype id
+            $query->setParameter('mimetype', $mimetype);
+            $result = $query->execute();
+            $mimetypeId = (int)$result->fetchOne();
+            $result->closeCursor();
+
+            if (!$mimetypeId) {
+                // insert mimetype
+                $insert->setParameter('mimetype', $mimetype);
+                $insert->execute();
+                $mimetypeId = $insert->getLastInsertId();
+            }
+
+            // change mimetype for files with x extension
+            $update->setParameter('mimetype', $mimetypeId)
+                ->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
+            $count += $update->execute();
+        }
+
+        return $count;
+    }
+
+    /**
+     * @throws Exception
+     * @since 12.0.0.14
+     */
+    private function introduceImageTypes(): IResult|int|null {
+        $updatedMimetypes = [
+            'jp2' => 'image/jp2',
+            'webp' => 'image/webp',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 12.0.0.13
+     */
+    private function introduceWindowsProgramTypes(): IResult|int|null {
+        $updatedMimetypes = [
+            'htaccess' => 'text/plain',
+            'bat' => 'application/x-msdos-program',
+            'cmd' => 'application/cmd',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 13.0.0.0
+     */
+    private function introduceLocationTypes(): IResult|int|null {
+        $updatedMimetypes = [
+            'gpx' => 'application/gpx+xml',
+            'kml' => 'application/vnd.google-earth.kml+xml',
+            'kmz' => 'application/vnd.google-earth.kmz',
+            'tcx' => 'application/vnd.garmin.tcx+xml',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 13.0.0.3
+     */
+    private function introduceInternetShortcutTypes(): IResult|int|null {
+        $updatedMimetypes = [
+            'url' => 'application/internet-shortcut',
+            'webloc' => 'application/internet-shortcut'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 13.0.0.6
+     */
+    private function introduceStreamingTypes(): IResult|int|null {
+        $updatedMimetypes = [
+            'm3u' => 'audio/mpegurl',
+            'm3u8' => 'audio/mpegurl',
+            'pls' => 'audio/x-scpls'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 14.0.0.8
+     */
+    private function introduceVisioTypes(): IResult|int|null {
+        $updatedMimetypes = [
+            'vsdm' => 'application/vnd.visio',
+            'vsdx' => 'application/vnd.visio',
+            'vssm' => 'application/vnd.visio',
+            'vssx' => 'application/vnd.visio',
+            'vstm' => 'application/vnd.visio',
+            'vstx' => 'application/vnd.visio',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 14.0.0.10
+     */
+    private function introduceComicbookTypes(): IResult|int|null {
+        $updatedMimetypes = [
+            'cb7' => 'application/comicbook+7z',
+            'cba' => 'application/comicbook+ace',
+            'cbr' => 'application/comicbook+rar',
+            'cbt' => 'application/comicbook+tar',
+            'cbtc' => 'application/comicbook+truecrypt',
+            'cbz' => 'application/comicbook+zip',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 20.0.0.5
+     */
+    private function introduceOpenDocumentTemplates(): IResult|int|null {
+        $updatedMimetypes = [
+            'ott' => 'application/vnd.oasis.opendocument.text-template',
+            'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+            'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+            'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 21.0.0.7
+     */
+    private function introduceOrgModeType(): IResult|int|null {
+        $updatedMimetypes = [
+            'org' => 'text/org'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 23.0.0.2
+     */
+    private function introduceFlatOpenDocumentType(): IResult|int|null {
+        $updatedMimetypes = [
+            'fodt' => 'application/vnd.oasis.opendocument.text-flat-xml',
+            'fods' => 'application/vnd.oasis.opendocument.spreadsheet-flat-xml',
+            'fodg' => 'application/vnd.oasis.opendocument.graphics-flat-xml',
+            'fodp' => 'application/vnd.oasis.opendocument.presentation-flat-xml',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 25.0.0.2
+     */
+    private function introduceOnlyofficeFormType(): IResult|int|null {
+        $updatedMimetypes = [
+            'oform' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform',
+            'docxf' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 26.0.0.1
+     */
+    private function introduceAsciidocType(): IResult|int|null {
+        $updatedMimetypes = [
+            'adoc' => 'text/asciidoc',
+            'asciidoc' => 'text/asciidoc',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 28.0.0.5
+     */
+    private function introduceEnhancedMetafileFormatType(): IResult|int|null {
+        $updatedMimetypes = [
+            'emf' => 'image/emf',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 29.0.0.2
+     */
+    private function introduceEmlAndMsgFormatType(): IResult|int|null {
+        $updatedMimetypes = [
+            'eml' => 'message/rfc822',
+            'msg' => 'application/vnd.ms-outlook',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 29.0.0.6
+     */
+    private function introduceAacAudioType(): IResult|int|null {
+        $updatedMimetypes = [
+            'aac' => 'audio/aac',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 29.0.10
+     */
+    private function introduceReStructuredTextFormatType(): IResult|int|null {
+        $updatedMimetypes = [
+            'rst' => 'text/x-rst',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 30.0.0
+     */
+    private function introduceExcalidrawType(): IResult|int|null {
+        $updatedMimetypes = [
+            'excalidraw' => 'application/vnd.excalidraw+json',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+
+    /**
+     * @throws Exception
+     * @since 31.0.0
+     */
+    private function introduceZstType(): IResult|int|null {
+        $updatedMimetypes = [
+            'zst' => 'application/zstd',
+            'nfo' => 'text/x-nfo',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 32.0.0
+     */
+    private function introduceMusicxmlType(): IResult|int|null {
+        $updatedMimetypes = [
+            'mxl' => 'application/vnd.recordare.musicxml',
+            'musicxml' => 'application/vnd.recordare.musicxml+xml',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * @throws Exception
+     * @since 32.0.0
+     */
+    private function introduceTextType(): IResult|int|null {
+        $updatedMimetypes = [
+            'text' => 'text/plain',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+
+
+    /**
+     * Check if there are any migrations available
+     *
+     * @throws Exception
+     */
+    public function migrationsAvailable(): bool {
+        $this->dryRun = true;
+        $this->run(new NullOutput());
+        $this->dryRun = false;
+        return $this->changeCount > 0;
+    }
+
+    /**
+     * Get the current mimetype version
+     */
+    private function getMimeTypeVersion(): string {
+        $serverVersion = $this->config->getSystemValueString('version', '0.0.0');
+        // 29.0.0.10 is the last version with a mimetype migration before it was moved to a separate version number
+        if (version_compare($serverVersion, '29.0.0.10', '>')) {
+            return $this->appConfig->getValueString('files', 'mimetype_version', '29.0.0.10');
+        }
+
+        return $serverVersion;
+    }
+
+    /**
+     * Fix mime types
+     *
+     * @throws Exception
+     */
+    public function run(IOutput $output): void {
+        $serverVersion = $this->config->getSystemValueString('version', '0.0.0');
+        $mimeTypeVersion = $this->getMimeTypeVersion();
+
+        // NOTE TO DEVELOPERS: when adding new mime types, please make sure to
+        // add a version comparison to avoid doing it every time
+        // PLEASE ALSO KEEP THE LIST SORTED BY VERSION NUMBER
+
+        if (version_compare($mimeTypeVersion, '12.0.0.14', '<') && $this->introduceImageTypes()) {
+            $output->info('Fixed image mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
+            $output->info('Fixed windows program mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
+            $output->info('Fixed geospatial mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
+            $output->info('Fixed internet-shortcut mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
+            $output->info('Fixed streaming mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
+            $output->info('Fixed visio mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
+            $output->info('Fixed comicbook mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
+            $output->info('Fixed OpenDocument template mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '21.0.0.7', '<') && $this->introduceOrgModeType()) {
+            $output->info('Fixed orgmode mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '23.0.0.2', '<') && $this->introduceFlatOpenDocumentType()) {
+            $output->info('Fixed Flat OpenDocument mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '25.0.0.2', '<') && $this->introduceOnlyofficeFormType()) {
+            $output->info('Fixed ONLYOFFICE Forms OpenXML mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '26.0.0.1', '<') && $this->introduceAsciidocType()) {
+            $output->info('Fixed AsciiDoc mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '28.0.0.5', '<') && $this->introduceEnhancedMetafileFormatType()) {
+            $output->info('Fixed Enhanced Metafile Format mime types');
+        }
+
+        if (version_compare($mimeTypeVersion, '29.0.0.2', '<') && $this->introduceEmlAndMsgFormatType()) {
+            $output->info('Fixed eml and msg mime type');
+        }
+
+        if (version_compare($mimeTypeVersion, '29.0.0.6', '<') && $this->introduceAacAudioType()) {
+            $output->info('Fixed aac mime type');
+        }
+
+        if (version_compare($mimeTypeVersion, '29.0.0.10', '<') && $this->introduceReStructuredTextFormatType()) {
+            $output->info('Fixed ReStructured Text mime type');
+        }
+
+        if (version_compare($mimeTypeVersion, '30.0.0.0', '<') && $this->introduceExcalidrawType()) {
+            $output->info('Fixed Excalidraw mime type');
+        }
+
+        if (version_compare($mimeTypeVersion, '31.0.0.0', '<') && $this->introduceZstType()) {
+            $output->info('Fixed zst mime type');
+        }
+
+        if (version_compare($mimeTypeVersion, '32.0.0.0', '<') && $this->introduceMusicxmlType()) {
+            $output->info('Fixed musicxml mime type');
+        }
+
+        if (version_compare($mimeTypeVersion, '32.0.0.0', '<') && $this->introduceTextType()) {
+            $out->info('Fixed text mime type');
+        }
+
+        if (!$this->dryRun) {
+            $this->appConfig->setValueString('files', 'mimetype_version', $serverVersion);
+        }
+    }
 }

apps/dav/lib/Migration/BuildSocialSearchIndexBackgroundJob.php

Indentation +58 added lines, -58 removed lines

@@ -17,72 +17,72 @@
 use Psr\Log\LoggerInterface;
 
 class BuildSocialSearchIndexBackgroundJob extends QueuedJob {
-	public function __construct(
-		private IDBConnection $db,
-		private CardDavBackend $davBackend,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		ITimeFactory $timeFactory,
-	) {
-		parent::__construct($timeFactory);
-	}
+    public function __construct(
+        private IDBConnection $db,
+        private CardDavBackend $davBackend,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        ITimeFactory $timeFactory,
+    ) {
+        parent::__construct($timeFactory);
+    }
 
-	public function run($argument) {
-		$offset = $argument['offset'];
-		$stopAt = $argument['stopAt'];
+    public function run($argument) {
+        $offset = $argument['offset'];
+        $stopAt = $argument['stopAt'];
 
-		$this->logger->info('Indexing social profile data (' . $offset . '/' . $stopAt . ')');
+        $this->logger->info('Indexing social profile data (' . $offset . '/' . $stopAt . ')');
 
-		$offset = $this->buildIndex($offset, $stopAt);
+        $offset = $this->buildIndex($offset, $stopAt);
 
-		if ($offset >= $stopAt) {
-			$this->logger->info('All contacts with social profiles indexed');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New social profile indexing job scheduled with offset ' . $offset);
-		}
-	}
+        if ($offset >= $stopAt) {
+            $this->logger->info('All contacts with social profiles indexed');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New social profile indexing job scheduled with offset ' . $offset);
+        }
+    }
 
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex($offset, $stopAt) {
-		$startTime = $this->time->getTime();
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex($offset, $stopAt) {
+        $startTime = $this->time->getTime();
 
-		// get contacts with social profiles
-		$query = $this->db->getQueryBuilder();
-		$query->select('id', 'addressbookid', 'uri', 'carddata')
-			->from('cards', 'c')
-			->orderBy('id', 'ASC')
-			->where($query->expr()->like('carddata', $query->createNamedParameter('%SOCIALPROFILE%')))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter((int)$offset, IQueryBuilder::PARAM_INT)))
-			->setMaxResults(100);
-		$social_cards = $query->executeQuery()->fetchAll();
+        // get contacts with social profiles
+        $query = $this->db->getQueryBuilder();
+        $query->select('id', 'addressbookid', 'uri', 'carddata')
+            ->from('cards', 'c')
+            ->orderBy('id', 'ASC')
+            ->where($query->expr()->like('carddata', $query->createNamedParameter('%SOCIALPROFILE%')))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter((int)$offset, IQueryBuilder::PARAM_INT)))
+            ->setMaxResults(100);
+        $social_cards = $query->executeQuery()->fetchAll();
 
-		if (empty($social_cards)) {
-			return $stopAt;
-		}
+        if (empty($social_cards)) {
+            return $stopAt;
+        }
 
-		// refresh identified contacts in order to re-index
-		foreach ($social_cards as $contact) {
-			$offset = $contact['id'];
-			$cardData = $contact['carddata'];
-			if (is_resource($cardData) && (get_resource_type($cardData) === 'stream')) {
-				$cardData = stream_get_contents($cardData);
-			}
-			$this->davBackend->updateCard($contact['addressbookid'], $contact['uri'], $cardData);
+        // refresh identified contacts in order to re-index
+        foreach ($social_cards as $contact) {
+            $offset = $contact['id'];
+            $cardData = $contact['carddata'];
+            if (is_resource($cardData) && (get_resource_type($cardData) === 'stream')) {
+                $cardData = stream_get_contents($cardData);
+            }
+            $this->davBackend->updateCard($contact['addressbookid'], $contact['uri'], $cardData);
 
-			// stop after 15sec (to be continued with next chunk)
-			if (($this->time->getTime() - $startTime) > 15) {
-				break;
-			}
-		}
+            // stop after 15sec (to be continued with next chunk)
+            if (($this->time->getTime() - $startTime) > 15) {
+                break;
+            }
+        }
 
-		return $offset;
-	}
+        return $offset;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
 		$offset = $argument['offset'];
 		$stopAt = $argument['stopAt'];
 
-		$this->logger->info('Indexing social profile data (' . $offset . '/' . $stopAt . ')');
+		$this->logger->info('Indexing social profile data ('.$offset.'/'.$stopAt.')');
 
 		$offset = $this->buildIndex($offset, $stopAt);
 
@@ -42,7 +42,7 @@ 
 				'offset' => $offset,
 				'stopAt' => $stopAt
 			]);
-			$this->logger->info('New social profile indexing job scheduled with offset ' . $offset);
+			$this->logger->info('New social profile indexing job scheduled with offset '.$offset);
 		}
 	}
 
@@ -60,7 +60,7 @@ 
 			->from('cards', 'c')
 			->orderBy('id', 'ASC')
 			->where($query->expr()->like('carddata', $query->createNamedParameter('%SOCIALPROFILE%')))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter((int)$offset, IQueryBuilder::PARAM_INT)))
+			->andWhere($query->expr()->gt('id', $query->createNamedParameter((int) $offset, IQueryBuilder::PARAM_INT)))
 			->setMaxResults(100);
 		$social_cards = $query->executeQuery()->fetchAll();
 

apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php

Indentation +54 added lines, -54 removed lines

@@ -16,67 +16,67 @@
 use Psr\Log\LoggerInterface;
 
 class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
-	public function __construct(
-		private IDBConnection $db,
-		private CalDavBackend $calDavBackend,
-		private LoggerInterface $logger,
-		private IJobList $jobList,
-		ITimeFactory $timeFactory,
-	) {
-		parent::__construct($timeFactory);
-	}
+    public function __construct(
+        private IDBConnection $db,
+        private CalDavBackend $calDavBackend,
+        private LoggerInterface $logger,
+        private IJobList $jobList,
+        ITimeFactory $timeFactory,
+    ) {
+        parent::__construct($timeFactory);
+    }
 
-	public function run($argument) {
-		$offset = (int)$argument['offset'];
-		$stopAt = (int)$argument['stopAt'];
+    public function run($argument) {
+        $offset = (int)$argument['offset'];
+        $stopAt = (int)$argument['stopAt'];
 
-		$this->logger->info('Building calendar index (' . $offset . '/' . $stopAt . ')');
+        $this->logger->info('Building calendar index (' . $offset . '/' . $stopAt . ')');
 
-		$startTime = $this->time->getTime();
-		while (($this->time->getTime() - $startTime) < 15) {
-			$offset = $this->buildIndex($offset, $stopAt);
-			if ($offset >= $stopAt) {
-				break;
-			}
-		}
+        $startTime = $this->time->getTime();
+        while (($this->time->getTime() - $startTime) < 15) {
+            $offset = $this->buildIndex($offset, $stopAt);
+            if ($offset >= $stopAt) {
+                break;
+            }
+        }
 
-		if ($offset >= $stopAt) {
-			$this->logger->info('Building calendar index done');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
-		}
-	}
+        if ($offset >= $stopAt) {
+            $this->logger->info('Building calendar index done');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+        }
+    }
 
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex(int $offset, int $stopAt): int {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'calendarid', 'uri', 'calendardata'])
-			->from('calendarobjects')
-			->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
-			->orderBy('id', 'ASC')
-			->setMaxResults(500);
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex(int $offset, int $stopAt): int {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'calendarid', 'uri', 'calendardata'])
+            ->from('calendarobjects')
+            ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
+            ->orderBy('id', 'ASC')
+            ->setMaxResults(500);
 
-		$result = $query->executeQuery();
-		while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
-			$offset = $row['id'];
+        $result = $query->executeQuery();
+        while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
+            $offset = $row['id'];
 
-			$calendarData = $row['calendardata'];
-			if (is_resource($calendarData)) {
-				$calendarData = stream_get_contents($calendarData);
-			}
+            $calendarData = $row['calendardata'];
+            if (is_resource($calendarData)) {
+                $calendarData = stream_get_contents($calendarData);
+            }
 
-			$this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
-		}
+            $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
+        }
 
-		return $offset;
-	}
+        return $offset;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -27,10 +27,10 @@ 
 	}
 
 	public function run($argument) {
-		$offset = (int)$argument['offset'];
-		$stopAt = (int)$argument['stopAt'];
+		$offset = (int) $argument['offset'];
+		$stopAt = (int) $argument['stopAt'];
 
-		$this->logger->info('Building calendar index (' . $offset . '/' . $stopAt . ')');
+		$this->logger->info('Building calendar index ('.$offset.'/'.$stopAt.')');
 
 		$startTime = $this->time->getTime();
 		while (($this->time->getTime() - $startTime) < 15) {
@@ -47,7 +47,7 @@ 
 				'offset' => $offset,
 				'stopAt' => $stopAt
 			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+			$this->logger->info('New building calendar index job scheduled with offset '.$offset);
 		}
 	}
 

core/BackgroundJobs/CheckForUserCertificates.php

Indentation +37 added lines, -37 removed lines

@@ -18,43 +18,43 @@
 use OCP\IUserManager;
 
 class CheckForUserCertificates extends QueuedJob {
-	public function __construct(
-		protected IConfig $config,
-		private IUserManager $userManager,
-		private IRootFolder $rootFolder,
-		ITimeFactory $time,
-	) {
-		parent::__construct($time);
-	}
+    public function __construct(
+        protected IConfig $config,
+        private IUserManager $userManager,
+        private IRootFolder $rootFolder,
+        ITimeFactory $time,
+    ) {
+        parent::__construct($time);
+    }
 
-	/**
-	 * Checks all user directories for old user uploaded certificates
-	 */
-	public function run($argument): void {
-		$uploadList = [];
-		$this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList): void {
-			$userId = $user->getUID();
-			try {
-				\OC_Util::setupFS($userId);
-				$filesExternalUploadsFolder = $this->rootFolder->get($userId . '/files_external/uploads');
-			} catch (NotFoundException $e) {
-				\OC_Util::tearDownFS();
-				return;
-			}
-			if ($filesExternalUploadsFolder instanceof Folder) {
-				$files = $filesExternalUploadsFolder->getDirectoryListing();
-				foreach ($files as $file) {
-					$filename = $file->getName();
-					$uploadList[] = "$userId/files_external/uploads/$filename";
-				}
-			}
-			\OC_Util::tearDownFS();
-		});
+    /**
+     * Checks all user directories for old user uploaded certificates
+     */
+    public function run($argument): void {
+        $uploadList = [];
+        $this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList): void {
+            $userId = $user->getUID();
+            try {
+                \OC_Util::setupFS($userId);
+                $filesExternalUploadsFolder = $this->rootFolder->get($userId . '/files_external/uploads');
+            } catch (NotFoundException $e) {
+                \OC_Util::tearDownFS();
+                return;
+            }
+            if ($filesExternalUploadsFolder instanceof Folder) {
+                $files = $filesExternalUploadsFolder->getDirectoryListing();
+                foreach ($files as $file) {
+                    $filename = $file->getName();
+                    $uploadList[] = "$userId/files_external/uploads/$filename";
+                }
+            }
+            \OC_Util::tearDownFS();
+        });
 
-		if (empty($uploadList)) {
-			$this->config->deleteAppValue('files_external', 'user_certificate_scan');
-		} else {
-			$this->config->setAppValue('files_external', 'user_certificate_scan', json_encode($uploadList));
-		}
-	}
+        if (empty($uploadList)) {
+            $this->config->deleteAppValue('files_external', 'user_certificate_scan');
+        } else {
+            $this->config->setAppValue('files_external', 'user_certificate_scan', json_encode($uploadList));
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -32,11 +32,11 @@
 	 */
 	public function run($argument): void {
 		$uploadList = [];
-		$this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList): void {
+		$this->userManager->callForSeenUsers(function(IUser $user) use (&$uploadList): void {
 			$userId = $user->getUID();
 			try {
 				\OC_Util::setupFS($userId);
-				$filesExternalUploadsFolder = $this->rootFolder->get($userId . '/files_external/uploads');
+				$filesExternalUploadsFolder = $this->rootFolder->get($userId.'/files_external/uploads');
 			} catch (NotFoundException $e) {
 				\OC_Util::tearDownFS();
 				return;