nextcloud / server

tests/lib/Snowflake/DecoderTest.php

Indentation +45 added lines, -45 removed lines

@@ -15,55 +15,55 @@
  * @package Test
  */
 class DecoderTest extends TestCase {
-	private Decoder $decoder;
+    private Decoder $decoder;
 
-	public function setUp():void {
-		$this->decoder = new Decoder();
-	}
+    public function setUp():void {
+        $this->decoder = new Decoder();
+    }
 
-	#[DataProvider('provideSnowflakeIds')]
-	public function testDecode(
-		string $snowflakeId,
-		float $timestamp,
-		int $serverId,
-		int $sequenceId,
-		bool $isCli,
-	): void {
-		$data = $this->decoder->decode($snowflakeId);
+    #[DataProvider('provideSnowflakeIds')]
+    public function testDecode(
+        string $snowflakeId,
+        float $timestamp,
+        int $serverId,
+        int $sequenceId,
+        bool $isCli,
+    ): void {
+        $data = $this->decoder->decode($snowflakeId);
 
-		$this->assertEquals($timestamp, (float)$data['createdAt']->format('U.v'));
-		$this->assertEquals($serverId, $data['serverId']);
-		$this->assertEquals($sequenceId, $data['sequenceId']);
-		$this->assertEquals($isCli, $data['isCli']);
-	}
+        $this->assertEquals($timestamp, (float)$data['createdAt']->format('U.v'));
+        $this->assertEquals($serverId, $data['serverId']);
+        $this->assertEquals($sequenceId, $data['sequenceId']);
+        $this->assertEquals($isCli, $data['isCli']);
+    }
 
-	public static function provideSnowflakeIds(): array {
-		$data = [
-			['4688076898113587', 1760368327.984, 392, 2099, true],
-			// Max milliseconds
-			['4190109696', 1759276800.999, 0, 0, false],
-			// Max serverId
-			['4186112', 1759276800.0, 511, 0, false],
-			// Max sequenceId
-			['4095', 1759276800.0, 0, 4095, false],
-			// Max isCli
-			['4096', 1759276800.0, 0, 0, true],
-			// Min
-			['0', 1759276800, 0, 0, false],
-			// Other
-			['250159983611680096', 1817521710, 392, 1376, true],
-		];
+    public static function provideSnowflakeIds(): array {
+        $data = [
+            ['4688076898113587', 1760368327.984, 392, 2099, true],
+            // Max milliseconds
+            ['4190109696', 1759276800.999, 0, 0, false],
+            // Max serverId
+            ['4186112', 1759276800.0, 511, 0, false],
+            // Max sequenceId
+            ['4095', 1759276800.0, 0, 4095, false],
+            // Max isCli
+            ['4096', 1759276800.0, 0, 0, true],
+            // Min
+            ['0', 1759276800, 0, 0, false],
+            // Other
+            ['250159983611680096', 1817521710, 392, 1376, true],
+        ];
 
-		// 32 bits can't handle large timestamps correctly
-		if (PHP_INT_SIZE === 8) {
-			// Max all (can't happen because ms are up to 999)
-			$data[] = ['999999999999', 3906760448.023, 511, 4095, true];
-			// Max all (real)
-			$data[] = ['9223372036754112511', 3906760447.999, 511, 4095, true];
-			// Max seconds
-			$data[] = ['9223372032559808512', 3906760447, 0, 0, false];
-		}
+        // 32 bits can't handle large timestamps correctly
+        if (PHP_INT_SIZE === 8) {
+            // Max all (can't happen because ms are up to 999)
+            $data[] = ['999999999999', 3906760448.023, 511, 4095, true];
+            // Max all (real)
+            $data[] = ['9223372036754112511', 3906760447.999, 511, 4095, true];
+            // Max seconds
+            $data[] = ['9223372032559808512', 3906760447, 0, 0, false];
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 }

core/Migrations/Version33000Date20251023120529.php

Indentation +53 added lines, -53 removed lines

@@ -21,66 +21,66 @@
  */
 #[AddIndex(table: 'preview_locations', type: IndexType::UNIQUE)]
 class Version33000Date20251023120529 extends SimpleMigrationStep {
-	public function __construct(
-		private readonly IDBConnection $connection,
-	) {
-	}
+    public function __construct(
+        private readonly IDBConnection $connection,
+    ) {
+    }
 
-	/**
-	 * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if ($schema->hasTable('preview_locations')) {
-			$table = $schema->getTable('preview_locations');
-			$table->addUniqueIndex(['bucket_name', 'object_store_name'], 'unique_bucket_store');
-		}
+        if ($schema->hasTable('preview_locations')) {
+            $table = $schema->getTable('preview_locations');
+            $table->addUniqueIndex(['bucket_name', 'object_store_name'], 'unique_bucket_store');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-		// This shouldn't run on a production instance, only daily
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('*')
-			->from('preview_locations');
-		$result = $qb->executeQuery();
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        // This shouldn't run on a production instance, only daily
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('*')
+            ->from('preview_locations');
+        $result = $qb->executeQuery();
 
-		$set = [];
+        $set = [];
 
-		while ($row = $result->fetch()) {
-			// Iterate over all the rows with duplicated rows
-			$id = $row['id'];
+        while ($row = $result->fetch()) {
+            // Iterate over all the rows with duplicated rows
+            $id = $row['id'];
 
-			if (isset($set[$row['bucket_name'] . '_' . $row['object_store_name']])) {
-				// duplicate
-				$authoritativeId = $set[$row['bucket_name'] . '_' . $row['object_store_name']];
-				$qb = $this->connection->getQueryBuilder();
-				$qb->select('id')
-					->from('preview_locations')
-					->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($row['bucket_name'])))
-					->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($row['object_store_name'])))
-					->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($authoritativeId)));
+            if (isset($set[$row['bucket_name'] . '_' . $row['object_store_name']])) {
+                // duplicate
+                $authoritativeId = $set[$row['bucket_name'] . '_' . $row['object_store_name']];
+                $qb = $this->connection->getQueryBuilder();
+                $qb->select('id')
+                    ->from('preview_locations')
+                    ->where($qb->expr()->eq('bucket_name', $qb->createNamedParameter($row['bucket_name'])))
+                    ->andWhere($qb->expr()->eq('object_store_name', $qb->createNamedParameter($row['object_store_name'])))
+                    ->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($authoritativeId)));
 
-				$result = $qb->executeQuery();
-				while ($row = $result->fetch()) {
-					// Update previews entries to the now de-duplicated id
-					$qb = $this->connection->getQueryBuilder();
-					$qb->update('previews')
-						->set('location_id', $qb->createNamedParameter($id))
-						->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
-					$qb->executeStatement();
+                $result = $qb->executeQuery();
+                while ($row = $result->fetch()) {
+                    // Update previews entries to the now de-duplicated id
+                    $qb = $this->connection->getQueryBuilder();
+                    $qb->update('previews')
+                        ->set('location_id', $qb->createNamedParameter($id))
+                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
+                    $qb->executeStatement();
 
-					$qb = $this->connection->getQueryBuilder();
-					$qb->delete('preview_locations')
-						->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
-					$qb->executeStatement();
-				}
-				break;
-			}
-			$set[$row['bucket_name'] . '_' . $row['object_store_name']] = $row['id'];
-		}
-	}
+                    $qb = $this->connection->getQueryBuilder();
+                    $qb->delete('preview_locations')
+                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($row['id'])));
+                    $qb->executeStatement();
+                }
+                break;
+            }
+            $set[$row['bucket_name'] . '_' . $row['object_store_name']] = $row['id'];
+        }
+    }
 }

core/Migrations/Version33000Date20251023110529.php

Indentation +20 added lines, -20 removed lines

@@ -21,24 +21,24 @@
 #[ModifyColumn(table: 'previews', name: 'id', description: 'Remove auto-increment')]
 #[ModifyColumn(table: 'preview_versions', name: 'id', description: 'Remove auto-increment')]
 class Version33000Date20251023110529 extends SimpleMigrationStep {
-	/**
-	 * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		$schema = $schemaClosure();
-
-		if ($schema->hasTable('preview_locations')) {
-			$schema->dropAutoincrementColumn('preview_locations', 'id');
-		}
-
-		if ($schema->hasTable('preview_versions')) {
-			$schema->dropAutoincrementColumn('preview_versions', 'id');
-		}
-
-		if ($schema->hasTable('previews')) {
-			$schema->dropAutoincrementColumn('previews', 'id');
-		}
-
-		return $schema;
-	}
+    /**
+     * @param Closure(): ISchemaWrapper $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('preview_locations')) {
+            $schema->dropAutoincrementColumn('preview_locations', 'id');
+        }
+
+        if ($schema->hasTable('preview_versions')) {
+            $schema->dropAutoincrementColumn('preview_versions', 'id');
+        }
+
+        if ($schema->hasTable('previews')) {
+            $schema->dropAutoincrementColumn('previews', 'id');
+        }
+
+        return $schema;
+    }
 }

core/register_command.php

Indentation +119 added lines, -119 removed lines

@@ -124,143 +124,143 @@
 $config = Server::get(IConfig::class);
 
 if ($config->getSystemValueBool('installed', false)) {
-	$application->add(Server::get(Disable::class));
-	$application->add(Server::get(Enable::class));
-	$application->add(Server::get(Install::class));
-	$application->add(Server::get(GetPath::class));
-	$application->add(Server::get(ListApps::class));
-	$application->add(Server::get(Remove::class));
-	$application->add(Server::get(Update::class));
+    $application->add(Server::get(Disable::class));
+    $application->add(Server::get(Enable::class));
+    $application->add(Server::get(Install::class));
+    $application->add(Server::get(GetPath::class));
+    $application->add(Server::get(ListApps::class));
+    $application->add(Server::get(Remove::class));
+    $application->add(Server::get(Update::class));
 
-	$application->add(Server::get(Cleanup::class));
-	$application->add(Server::get(Enforce::class));
-	$application->add(Server::get(Command\TwoFactorAuth\Enable::class));
-	$application->add(Server::get(Command\TwoFactorAuth\Disable::class));
-	$application->add(Server::get(State::class));
+    $application->add(Server::get(Cleanup::class));
+    $application->add(Server::get(Enforce::class));
+    $application->add(Server::get(Command\TwoFactorAuth\Enable::class));
+    $application->add(Server::get(Command\TwoFactorAuth\Disable::class));
+    $application->add(Server::get(State::class));
 
-	$application->add(Server::get(Mode::class));
-	$application->add(Server::get(Job::class));
-	$application->add(Server::get(ListCommand::class));
-	$application->add(Server::get(Delete::class));
-	$application->add(Server::get(JobWorker::class));
+    $application->add(Server::get(Mode::class));
+    $application->add(Server::get(Job::class));
+    $application->add(Server::get(ListCommand::class));
+    $application->add(Server::get(Delete::class));
+    $application->add(Server::get(JobWorker::class));
 
-	$application->add(Server::get(Test::class));
+    $application->add(Server::get(Test::class));
 
-	$application->add(Server::get(DeleteConfig::class));
-	$application->add(Server::get(GetConfig::class));
-	$application->add(Server::get(SetConfig::class));
-	$application->add(Server::get(Import::class));
-	$application->add(Server::get(ListConfigs::class));
-	$application->add(Server::get(Preset::class));
-	$application->add(Server::get(Command\Config\System\DeleteConfig::class));
-	$application->add(Server::get(Command\Config\System\GetConfig::class));
-	$application->add(Server::get(Command\Config\System\SetConfig::class));
+    $application->add(Server::get(DeleteConfig::class));
+    $application->add(Server::get(GetConfig::class));
+    $application->add(Server::get(SetConfig::class));
+    $application->add(Server::get(Import::class));
+    $application->add(Server::get(ListConfigs::class));
+    $application->add(Server::get(Preset::class));
+    $application->add(Server::get(Command\Config\System\DeleteConfig::class));
+    $application->add(Server::get(Command\Config\System\GetConfig::class));
+    $application->add(Server::get(Command\Config\System\SetConfig::class));
 
-	$application->add(Server::get(File::class));
-	$application->add(Server::get(Space::class));
-	$application->add(Server::get(Storage::class));
-	$application->add(Server::get(Storages::class));
+    $application->add(Server::get(File::class));
+    $application->add(Server::get(Space::class));
+    $application->add(Server::get(Storage::class));
+    $application->add(Server::get(Storages::class));
 
-	$application->add(Server::get(ConvertType::class));
-	$application->add(Server::get(ConvertMysqlToMB4::class));
-	$application->add(Server::get(ConvertFilecacheBigInt::class));
-	$application->add(Server::get(AddMissingColumns::class));
-	$application->add(Server::get(AddMissingIndices::class));
-	$application->add(Server::get(AddMissingPrimaryKeys::class));
-	$application->add(Server::get(ExpectedSchema::class));
-	$application->add(Server::get(ExportSchema::class));
+    $application->add(Server::get(ConvertType::class));
+    $application->add(Server::get(ConvertMysqlToMB4::class));
+    $application->add(Server::get(ConvertFilecacheBigInt::class));
+    $application->add(Server::get(AddMissingColumns::class));
+    $application->add(Server::get(AddMissingIndices::class));
+    $application->add(Server::get(AddMissingPrimaryKeys::class));
+    $application->add(Server::get(ExpectedSchema::class));
+    $application->add(Server::get(ExportSchema::class));
 
-	$application->add(Server::get(GenerateMetadataCommand::class));
-	$application->add(Server::get(PreviewCommand::class));
-	if ($config->getSystemValueBool('debug', false)) {
-		$application->add(Server::get(StatusCommand::class));
-		$application->add(Server::get(MigrateCommand::class));
-		$application->add(Server::get(GenerateCommand::class));
-		$application->add(Server::get(ExecuteCommand::class));
-	}
+    $application->add(Server::get(GenerateMetadataCommand::class));
+    $application->add(Server::get(PreviewCommand::class));
+    if ($config->getSystemValueBool('debug', false)) {
+        $application->add(Server::get(StatusCommand::class));
+        $application->add(Server::get(MigrateCommand::class));
+        $application->add(Server::get(GenerateCommand::class));
+        $application->add(Server::get(ExecuteCommand::class));
+    }
 
-	$application->add(Server::get(Command\Encryption\Disable::class));
-	$application->add(Server::get(Command\Encryption\Enable::class));
-	$application->add(Server::get(ListModules::class));
-	$application->add(Server::get(SetDefaultModule::class));
-	$application->add(Server::get(Command\Encryption\Status::class));
-	$application->add(Server::get(EncryptAll::class));
-	$application->add(Server::get(DecryptAll::class));
+    $application->add(Server::get(Command\Encryption\Disable::class));
+    $application->add(Server::get(Command\Encryption\Enable::class));
+    $application->add(Server::get(ListModules::class));
+    $application->add(Server::get(SetDefaultModule::class));
+    $application->add(Server::get(Command\Encryption\Status::class));
+    $application->add(Server::get(EncryptAll::class));
+    $application->add(Server::get(DecryptAll::class));
 
-	$application->add(Server::get(Manage::class));
-	$application->add(Server::get(Command\Log\File::class));
+    $application->add(Server::get(Manage::class));
+    $application->add(Server::get(Command\Log\File::class));
 
-	$application->add(Server::get(ChangeKeyStorageRoot::class));
-	$application->add(Server::get(ShowKeyStorageRoot::class));
-	$application->add(Server::get(MigrateKeyStorage::class));
+    $application->add(Server::get(ChangeKeyStorageRoot::class));
+    $application->add(Server::get(ShowKeyStorageRoot::class));
+    $application->add(Server::get(MigrateKeyStorage::class));
 
-	$application->add(Server::get(DataFingerprint::class));
-	$application->add(Server::get(UpdateDB::class));
-	$application->add(Server::get(UpdateJS::class));
-	$application->add(Server::get(Command\Maintenance\Mode::class));
-	$application->add(Server::get(UpdateHtaccess::class));
-	$application->add(Server::get(UpdateTheme::class));
+    $application->add(Server::get(DataFingerprint::class));
+    $application->add(Server::get(UpdateDB::class));
+    $application->add(Server::get(UpdateJS::class));
+    $application->add(Server::get(Command\Maintenance\Mode::class));
+    $application->add(Server::get(UpdateHtaccess::class));
+    $application->add(Server::get(UpdateTheme::class));
 
-	$application->add(Server::get(Upgrade::class));
-	$application->add(Server::get(Repair::class));
-	$application->add(Server::get(RepairShareOwnership::class));
+    $application->add(Server::get(Upgrade::class));
+    $application->add(Server::get(Repair::class));
+    $application->add(Server::get(RepairShareOwnership::class));
 
-	$application->add(Server::get(Command\Preview\Cleanup::class));
-	$application->add(Server::get(Generate::class));
-	$application->add(Server::get(ResetRenderedTexts::class));
+    $application->add(Server::get(Command\Preview\Cleanup::class));
+    $application->add(Server::get(Generate::class));
+    $application->add(Server::get(ResetRenderedTexts::class));
 
-	$application->add(Server::get(Add::class));
-	$application->add(Server::get(Command\User\Delete::class));
-	$application->add(Server::get(Command\User\Disable::class));
-	$application->add(Server::get(Command\User\Enable::class));
-	$application->add(Server::get(LastSeen::class));
-	$application->add(Server::get(Report::class));
-	$application->add(Server::get(ResetPassword::class));
-	$application->add(Server::get(Setting::class));
-	$application->add(Server::get(Profile::class));
-	$application->add(Server::get(Command\User\ListCommand::class));
-	$application->add(Server::get(ClearGeneratedAvatarCacheCommand::class));
-	$application->add(Server::get(Info::class));
-	$application->add(Server::get(SyncAccountDataCommand::class));
-	$application->add(Server::get(Command\User\AuthTokens\Add::class));
-	$application->add(Server::get(Command\User\AuthTokens\ListCommand::class));
-	$application->add(Server::get(Command\User\AuthTokens\Delete::class));
-	$application->add(Server::get(Verify::class));
-	$application->add(Server::get(Welcome::class));
+    $application->add(Server::get(Add::class));
+    $application->add(Server::get(Command\User\Delete::class));
+    $application->add(Server::get(Command\User\Disable::class));
+    $application->add(Server::get(Command\User\Enable::class));
+    $application->add(Server::get(LastSeen::class));
+    $application->add(Server::get(Report::class));
+    $application->add(Server::get(ResetPassword::class));
+    $application->add(Server::get(Setting::class));
+    $application->add(Server::get(Profile::class));
+    $application->add(Server::get(Command\User\ListCommand::class));
+    $application->add(Server::get(ClearGeneratedAvatarCacheCommand::class));
+    $application->add(Server::get(Info::class));
+    $application->add(Server::get(SyncAccountDataCommand::class));
+    $application->add(Server::get(Command\User\AuthTokens\Add::class));
+    $application->add(Server::get(Command\User\AuthTokens\ListCommand::class));
+    $application->add(Server::get(Command\User\AuthTokens\Delete::class));
+    $application->add(Server::get(Verify::class));
+    $application->add(Server::get(Welcome::class));
 
-	$application->add(Server::get(Command\Group\Add::class));
-	$application->add(Server::get(Command\Group\Delete::class));
-	$application->add(Server::get(Command\Group\ListCommand::class));
-	$application->add(Server::get(AddUser::class));
-	$application->add(Server::get(RemoveUser::class));
-	$application->add(Server::get(Command\Group\Info::class));
+    $application->add(Server::get(Command\Group\Add::class));
+    $application->add(Server::get(Command\Group\Delete::class));
+    $application->add(Server::get(Command\Group\ListCommand::class));
+    $application->add(Server::get(AddUser::class));
+    $application->add(Server::get(RemoveUser::class));
+    $application->add(Server::get(Command\Group\Info::class));
 
-	$application->add(Server::get(Command\SystemTag\ListCommand::class));
-	$application->add(Server::get(Command\SystemTag\Delete::class));
-	$application->add(Server::get(Command\SystemTag\Add::class));
-	$application->add(Server::get(Edit::class));
+    $application->add(Server::get(Command\SystemTag\ListCommand::class));
+    $application->add(Server::get(Command\SystemTag\Delete::class));
+    $application->add(Server::get(Command\SystemTag\Add::class));
+    $application->add(Server::get(Edit::class));
 
-	$application->add(Server::get(ListCertificates::class));
-	$application->add(Server::get(ExportCertificates::class));
-	$application->add(Server::get(ImportCertificate::class));
-	$application->add(Server::get(RemoveCertificate::class));
-	$application->add(Server::get(BruteforceAttempts::class));
-	$application->add(Server::get(BruteforceResetAttempts::class));
-	$application->add(Server::get(SetupChecks::class));
-	$application->add(Server::get(SnowflakeDecodeId::class));
-	$application->add(Server::get(Get::class));
+    $application->add(Server::get(ListCertificates::class));
+    $application->add(Server::get(ExportCertificates::class));
+    $application->add(Server::get(ImportCertificate::class));
+    $application->add(Server::get(RemoveCertificate::class));
+    $application->add(Server::get(BruteforceAttempts::class));
+    $application->add(Server::get(BruteforceResetAttempts::class));
+    $application->add(Server::get(SetupChecks::class));
+    $application->add(Server::get(SnowflakeDecodeId::class));
+    $application->add(Server::get(Get::class));
 
-	$application->add(Server::get(GetCommand::class));
-	$application->add(Server::get(EnabledCommand::class));
-	$application->add(Server::get(Command\TaskProcessing\ListCommand::class));
-	$application->add(Server::get(Statistics::class));
-	$application->add(Server::get(Command\TaskProcessing\Cleanup::class));
+    $application->add(Server::get(GetCommand::class));
+    $application->add(Server::get(EnabledCommand::class));
+    $application->add(Server::get(Command\TaskProcessing\ListCommand::class));
+    $application->add(Server::get(Statistics::class));
+    $application->add(Server::get(Command\TaskProcessing\Cleanup::class));
 
-	$application->add(Server::get(RedisCommand::class));
-	$application->add(Server::get(DistributedClear::class));
-	$application->add(Server::get(DistributedDelete::class));
-	$application->add(Server::get(DistributedGet::class));
-	$application->add(Server::get(DistributedSet::class));
+    $application->add(Server::get(RedisCommand::class));
+    $application->add(Server::get(DistributedClear::class));
+    $application->add(Server::get(DistributedDelete::class));
+    $application->add(Server::get(DistributedGet::class));
+    $application->add(Server::get(DistributedSet::class));
 } else {
-	$application->add(Server::get(Command\Maintenance\Install::class));
+    $application->add(Server::get(Command\Maintenance\Install::class));
 }

core/Command/SnowflakeDecodeId.php

Indentation +30 added lines, -30 removed lines

@@ -15,34 +15,34 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SnowflakeDecodeId extends Base {
-	protected function configure(): void {
-		parent::configure();
-
-		$this
-			->setName('decode-snowflake')
-			->setDescription('Decode Snowflake IDs used by Nextcloud')
-			->addArgument('snowflake-id', InputArgument::REQUIRED, 'Nextcloud Snowflake ID to decode');
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$snowflakeId = $input->getArgument('snowflake-id');
-		$data = (new Decoder)->decode($snowflakeId);
-
-		$rows = [
-			['Snowflake ID', $snowflakeId],
-			['Seconds', $data['seconds']],
-			['Milliseconds', $data['milliseconds']],
-			['Created from CLI', $data['isCli'] ? 'yes' : 'no'],
-			['Server ID', $data['serverId']],
-			['Sequence ID', $data['sequenceId']],
-			['Creation timestamp', $data['createdAt']->format('U.v')],
-			['Creation date', $data['createdAt']->format('Y-m-d H:i:s.v')],
-		];
-
-		$table = new Table($output);
-		$table->setRows($rows);
-		$table->render();
-
-		return Base::SUCCESS;
-	}
+    protected function configure(): void {
+        parent::configure();
+
+        $this
+            ->setName('decode-snowflake')
+            ->setDescription('Decode Snowflake IDs used by Nextcloud')
+            ->addArgument('snowflake-id', InputArgument::REQUIRED, 'Nextcloud Snowflake ID to decode');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $snowflakeId = $input->getArgument('snowflake-id');
+        $data = (new Decoder)->decode($snowflakeId);
+
+        $rows = [
+            ['Snowflake ID', $snowflakeId],
+            ['Seconds', $data['seconds']],
+            ['Milliseconds', $data['milliseconds']],
+            ['Created from CLI', $data['isCli'] ? 'yes' : 'no'],
+            ['Server ID', $data['serverId']],
+            ['Sequence ID', $data['sequenceId']],
+            ['Creation timestamp', $data['createdAt']->format('U.v')],
+            ['Creation date', $data['createdAt']->format('Y-m-d H:i:s.v')],
+        ];
+
+        $table = new Table($output);
+        $table->setRows($rows);
+        $table->render();
+
+        return Base::SUCCESS;
+    }
 }

core/BackgroundJobs/MovePreviewJob.php

Indentation +212 added lines, -212 removed lines

@@ -31,216 +31,216 @@
 use Psr\Log\LoggerInterface;
 
 class MovePreviewJob extends TimedJob {
-	private IAppData $appData;
-	private string $previewRootPath;
-
-	public function __construct(
-		ITimeFactory $time,
-		private readonly IAppConfig $appConfig,
-		private readonly IConfig $config,
-		private readonly PreviewMapper $previewMapper,
-		private readonly StorageFactory $storageFactory,
-		private readonly IDBConnection $connection,
-		private readonly IRootFolder $rootFolder,
-		private readonly IMimeTypeDetector $mimeTypeDetector,
-		private readonly IMimeTypeLoader $mimeTypeLoader,
-		private readonly LoggerInterface $logger,
-		private readonly IGenerator $generator,
-		IAppDataFactory $appDataFactory,
-	) {
-		parent::__construct($time);
-
-		$this->appData = $appDataFactory->get('preview');
-		$this->setTimeSensitivity(self::TIME_INSENSITIVE);
-		$this->setInterval(24 * 60 * 60);
-		$this->previewRootPath = 'appdata_' . $this->config->getSystemValueString('instanceid') . '/preview/';
-	}
-
-	#[Override]
-	protected function run(mixed $argument): void {
-		if ($this->appConfig->getValueBool('core', 'previewMovedDone')) {
-			return;
-		}
-
-		$startTime = time();
-		while (true) {
-			$qb = $this->connection->getQueryBuilder();
-			$qb->select('path')
-				->from('filecache')
-				// Hierarchical preview folder structure
-				->where($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%/%/%/%/%/%/%/%')))
-				// Legacy flat preview folder structure
-				->orWhere($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%.%')))
-				->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-				->setMaxResults(100);
-
-			$result = $qb->executeQuery();
-			$foundPreviews = $this->processQueryResult($result);
-
-			if (!$foundPreviews) {
-				break;
-			}
-
-			// Stop if execution time is more than one hour.
-			if (time() - $startTime > 3600) {
-				return;
-			}
-		}
-
-		$this->appConfig->setValueBool('core', 'previewMovedDone', true);
-	}
-
-	private function processQueryResult(IResult $result): bool {
-		$foundPreview = false;
-		$fileIds = [];
-		$flatFileIds = [];
-		while ($row = $result->fetch()) {
-			$pathSplit = explode('/', $row['path']);
-			assert(count($pathSplit) >= 2);
-			$fileId = (int)$pathSplit[count($pathSplit) - 2];
-			if (count($pathSplit) === 11) {
-				// Hierarchical structure
-				if (!in_array($fileId, $fileIds)) {
-					$fileIds[] = $fileId;
-				}
-			} else {
-				// Flat structure
-				if (!in_array($fileId, $flatFileIds)) {
-					$flatFileIds[] = $fileId;
-				}
-			}
-			$foundPreview = true;
-		}
-
-		foreach ($fileIds as $fileId) {
-			$this->processPreviews($fileId, flatPath: false);
-		}
-
-		foreach ($flatFileIds as $fileId) {
-			$this->processPreviews($fileId, flatPath: true);
-		}
-		return $foundPreview;
-	}
-
-	/**
-	 * @param array<string|int, string[]> $previewFolders
-	 */
-	private function processPreviews(int $fileId, bool $flatPath): void {
-		$internalPath = $this->getInternalFolder((string)$fileId, $flatPath);
-		$folder = $this->appData->getFolder($internalPath);
-
-		/**
-		 * @var list<array{file: SimpleFile, preview: Preview}> $previewFiles
-		 */
-		$previewFiles = [];
-
-		foreach ($folder->getDirectoryListing() as $previewFile) {
-			$path = $fileId . '/' . $previewFile->getName();
-			/** @var SimpleFile $previewFile */
-			$preview = Preview::fromPath($path, $this->mimeTypeDetector);
-			$preview->setId($this->generator->nextId());
-			if (!$preview) {
-				$this->logger->error('Unable to import old preview at path.');
-				continue;
-			}
-			$preview->setSize($previewFile->getSize());
-			$preview->setMtime($previewFile->getMtime());
-			$preview->setOldFileId($previewFile->getId());
-			$preview->setEncrypted(false);
-
-			$previewFiles[] = [
-				'file' => $previewFile,
-				'preview' => $preview,
-			];
-		}
-
-		$qb = $this->connection->getQueryBuilder();
-		$qb->select('storage', 'etag', 'mimetype')
-			->from('filecache')
-			->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
-			->setMaxResults(1);
-
-		$result = $qb->executeQuery();
-		$result = $result->fetchAll();
-
-		if (count($result) > 0) {
-			foreach ($previewFiles as $previewFile) {
-				/** @var Preview $preview */
-				$preview = $previewFile['preview'];
-				/** @var SimpleFile $file */
-				$file = $previewFile['file'];
-				$preview->setStorageId($result[0]['storage']);
-				$preview->setEtag($result[0]['etag']);
-				$preview->setSourceMimeType($this->mimeTypeLoader->getMimetypeById((int)$result[0]['mimetype']));
-				try {
-					$preview = $this->previewMapper->insert($preview);
-				} catch (Exception) {
-					// We already have this preview in the preview table, skip
-					$qb->delete('filecache')
-						->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
-						->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-						->executeStatement();
-					continue;
-				}
-
-				try {
-					$this->storageFactory->migratePreview($preview, $file);
-					$qb = $this->connection->getQueryBuilder();
-					$qb->delete('filecache')
-						->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
-						->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-						->executeStatement();
-					// Do not call $file->delete() as this will also delete the file from the file system
-				} catch (\Exception $e) {
-					$this->previewMapper->delete($preview);
-					throw $e;
-				}
-			}
-		} else {
-			// No matching fileId, delete preview
-			try {
-				$this->connection->beginTransaction();
-				foreach ($previewFiles as $previewFile) {
-					/** @var SimpleFile $file */
-					$file = $previewFile['file'];
-					$file->delete();
-				}
-				$this->connection->commit();
-			} catch (Exception) {
-				$this->connection->rollback();
-			}
-		}
-
-		$this->deleteFolder($internalPath);
-	}
-
-	public static function getInternalFolder(string $name, bool $flatPath): string {
-		if ($flatPath) {
-			return $name;
-		}
-		return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
-	}
-
-	private function deleteFolder(string $path): void {
-		$current = $path;
-
-		while (true) {
-			$appDataPath = $this->previewRootPath . $current;
-			$qb = $this->connection->getQueryBuilder();
-			$qb->delete('filecache')
-				->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($appDataPath))))
-				->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
-				->executeStatement();
-
-			$current = dirname($current);
-			if ($current === '/' || $current === '.' || $current === '') {
-				break;
-			}
-
-			$folder = $this->appData->getFolder($current);
-			if (count($folder->getDirectoryListing()) !== 0) {
-				break;
-			}
-		}
-	}
+    private IAppData $appData;
+    private string $previewRootPath;
+
+    public function __construct(
+        ITimeFactory $time,
+        private readonly IAppConfig $appConfig,
+        private readonly IConfig $config,
+        private readonly PreviewMapper $previewMapper,
+        private readonly StorageFactory $storageFactory,
+        private readonly IDBConnection $connection,
+        private readonly IRootFolder $rootFolder,
+        private readonly IMimeTypeDetector $mimeTypeDetector,
+        private readonly IMimeTypeLoader $mimeTypeLoader,
+        private readonly LoggerInterface $logger,
+        private readonly IGenerator $generator,
+        IAppDataFactory $appDataFactory,
+    ) {
+        parent::__construct($time);
+
+        $this->appData = $appDataFactory->get('preview');
+        $this->setTimeSensitivity(self::TIME_INSENSITIVE);
+        $this->setInterval(24 * 60 * 60);
+        $this->previewRootPath = 'appdata_' . $this->config->getSystemValueString('instanceid') . '/preview/';
+    }
+
+    #[Override]
+    protected function run(mixed $argument): void {
+        if ($this->appConfig->getValueBool('core', 'previewMovedDone')) {
+            return;
+        }
+
+        $startTime = time();
+        while (true) {
+            $qb = $this->connection->getQueryBuilder();
+            $qb->select('path')
+                ->from('filecache')
+                // Hierarchical preview folder structure
+                ->where($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%/%/%/%/%/%/%/%')))
+                // Legacy flat preview folder structure
+                ->orWhere($qb->expr()->like('path', $qb->createNamedParameter($this->previewRootPath . '%/%.%')))
+                ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                ->setMaxResults(100);
+
+            $result = $qb->executeQuery();
+            $foundPreviews = $this->processQueryResult($result);
+
+            if (!$foundPreviews) {
+                break;
+            }
+
+            // Stop if execution time is more than one hour.
+            if (time() - $startTime > 3600) {
+                return;
+            }
+        }
+
+        $this->appConfig->setValueBool('core', 'previewMovedDone', true);
+    }
+
+    private function processQueryResult(IResult $result): bool {
+        $foundPreview = false;
+        $fileIds = [];
+        $flatFileIds = [];
+        while ($row = $result->fetch()) {
+            $pathSplit = explode('/', $row['path']);
+            assert(count($pathSplit) >= 2);
+            $fileId = (int)$pathSplit[count($pathSplit) - 2];
+            if (count($pathSplit) === 11) {
+                // Hierarchical structure
+                if (!in_array($fileId, $fileIds)) {
+                    $fileIds[] = $fileId;
+                }
+            } else {
+                // Flat structure
+                if (!in_array($fileId, $flatFileIds)) {
+                    $flatFileIds[] = $fileId;
+                }
+            }
+            $foundPreview = true;
+        }
+
+        foreach ($fileIds as $fileId) {
+            $this->processPreviews($fileId, flatPath: false);
+        }
+
+        foreach ($flatFileIds as $fileId) {
+            $this->processPreviews($fileId, flatPath: true);
+        }
+        return $foundPreview;
+    }
+
+    /**
+     * @param array<string|int, string[]> $previewFolders
+     */
+    private function processPreviews(int $fileId, bool $flatPath): void {
+        $internalPath = $this->getInternalFolder((string)$fileId, $flatPath);
+        $folder = $this->appData->getFolder($internalPath);
+
+        /**
+         * @var list<array{file: SimpleFile, preview: Preview}> $previewFiles
+         */
+        $previewFiles = [];
+
+        foreach ($folder->getDirectoryListing() as $previewFile) {
+            $path = $fileId . '/' . $previewFile->getName();
+            /** @var SimpleFile $previewFile */
+            $preview = Preview::fromPath($path, $this->mimeTypeDetector);
+            $preview->setId($this->generator->nextId());
+            if (!$preview) {
+                $this->logger->error('Unable to import old preview at path.');
+                continue;
+            }
+            $preview->setSize($previewFile->getSize());
+            $preview->setMtime($previewFile->getMtime());
+            $preview->setOldFileId($previewFile->getId());
+            $preview->setEncrypted(false);
+
+            $previewFiles[] = [
+                'file' => $previewFile,
+                'preview' => $preview,
+            ];
+        }
+
+        $qb = $this->connection->getQueryBuilder();
+        $qb->select('storage', 'etag', 'mimetype')
+            ->from('filecache')
+            ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($fileId)))
+            ->setMaxResults(1);
+
+        $result = $qb->executeQuery();
+        $result = $result->fetchAll();
+
+        if (count($result) > 0) {
+            foreach ($previewFiles as $previewFile) {
+                /** @var Preview $preview */
+                $preview = $previewFile['preview'];
+                /** @var SimpleFile $file */
+                $file = $previewFile['file'];
+                $preview->setStorageId($result[0]['storage']);
+                $preview->setEtag($result[0]['etag']);
+                $preview->setSourceMimeType($this->mimeTypeLoader->getMimetypeById((int)$result[0]['mimetype']));
+                try {
+                    $preview = $this->previewMapper->insert($preview);
+                } catch (Exception) {
+                    // We already have this preview in the preview table, skip
+                    $qb->delete('filecache')
+                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
+                        ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                        ->executeStatement();
+                    continue;
+                }
+
+                try {
+                    $this->storageFactory->migratePreview($preview, $file);
+                    $qb = $this->connection->getQueryBuilder();
+                    $qb->delete('filecache')
+                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($file->getId())))
+                        ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                        ->executeStatement();
+                    // Do not call $file->delete() as this will also delete the file from the file system
+                } catch (\Exception $e) {
+                    $this->previewMapper->delete($preview);
+                    throw $e;
+                }
+            }
+        } else {
+            // No matching fileId, delete preview
+            try {
+                $this->connection->beginTransaction();
+                foreach ($previewFiles as $previewFile) {
+                    /** @var SimpleFile $file */
+                    $file = $previewFile['file'];
+                    $file->delete();
+                }
+                $this->connection->commit();
+            } catch (Exception) {
+                $this->connection->rollback();
+            }
+        }
+
+        $this->deleteFolder($internalPath);
+    }
+
+    public static function getInternalFolder(string $name, bool $flatPath): string {
+        if ($flatPath) {
+            return $name;
+        }
+        return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
+    }
+
+    private function deleteFolder(string $path): void {
+        $current = $path;
+
+        while (true) {
+            $appDataPath = $this->previewRootPath . $current;
+            $qb = $this->connection->getQueryBuilder();
+            $qb->delete('filecache')
+                ->where($qb->expr()->eq('path_hash', $qb->createNamedParameter(md5($appDataPath))))
+                ->hintShardKey('storage', $this->rootFolder->getMountPoint()->getNumericStorageId())
+                ->executeStatement();
+
+            $current = dirname($current);
+            if ($current === '/' || $current === '.' || $current === '') {
+                break;
+            }
+
+            $folder = $this->appData->getFolder($current);
+            if (count($folder->getDirectoryListing()) !== 0) {
+                break;
+            }
+        }
+    }
 }