nextcloud / server

apps/files_sharing/lib/Command/CleanupRemoteStorages.php

Indentation +150 added lines, -150 removed lines

@@ -38,154 +38,154 @@
  */
 class CleanupRemoteStorages extends Command {
 
-	/**
-	 * @var IDBConnection
-	 */
-	protected $connection;
-
-	/**
-	 * @var ICloudIdManager
-	 */
-	private $cloudIdManager;
-
-	public function __construct(IDBConnection $connection, ICloudIdManager $cloudIdManager) {
-		$this->connection = $connection;
-		$this->cloudIdManager = $cloudIdManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('sharing:cleanup-remote-storages')
-			->setDescription('Cleanup shared storage entries that have no matching entry in the shares_external table')
-			->addOption(
-				'dry-run',
-				null,
-				InputOption::VALUE_NONE,
-				'only show which storages would be deleted'
-			);
-	}
-
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$remoteStorages = $this->getRemoteStorages();
-
-		$output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
-
-		$remoteShareIds = $this->getRemoteShareIds();
-
-		$output->writeln(count($remoteShareIds) . ' remote share(s) exist');
-
-		foreach ($remoteShareIds as $id => $remoteShareId) {
-			if (isset($remoteStorages[$remoteShareId])) {
-				if ($input->getOption('dry-run') || $output->isVerbose()) {
-					$output->writeln("<info>$remoteShareId belongs to remote share $id</info>");
-				}
-
-				unset($remoteStorages[$remoteShareId]);
-			} else {
-				$output->writeln("<comment>$remoteShareId for share $id has no matching storage, yet</comment>");
-			}
-		}
-
-		if (empty($remoteStorages)) {
-			$output->writeln('<info>no storages deleted</info>');
-		} else {
-			$dryRun = $input->getOption('dry-run');
-			foreach ($remoteStorages as $id => $numericId) {
-				if ($dryRun) {
-					$output->writeln("<error>$id [$numericId] can be deleted</error>");
-					$this->countFiles($numericId, $output);
-				} else {
-					$this->deleteStorage($id, $numericId, $output);
-				}
-			}
-		}
-		return 0;
-	}
-
-	public function countFiles($numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select($queryBuilder->func()->count('fileid'))
-			->from('filecache')
-			->where($queryBuilder->expr()->eq(
-				'storage',
-				$queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$result = $queryBuilder->execute();
-		$count = $result->fetchOne();
-		$output->writeln("$count files can be deleted for storage $numericId");
-	}
-
-	public function deleteStorage($id, $numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->delete('storages')
-			->where($queryBuilder->expr()->eq(
-				'id',
-				$queryBuilder->createNamedParameter($id, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$output->write("deleting $id [$numericId] ... ");
-		$count = $queryBuilder->execute();
-		$output->writeln("deleted $count storage");
-		$this->deleteFiles($numericId, $output);
-	}
-
-	public function deleteFiles($numericId, OutputInterface $output) {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->delete('filecache')
-			->where($queryBuilder->expr()->eq(
-				'storage',
-				$queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
-				IQueryBuilder::PARAM_STR)
-			);
-		$output->write("deleting files for storage $numericId ... ");
-		$count = $queryBuilder->execute();
-		$output->writeln("deleted $count files");
-	}
-
-	public function getRemoteStorages() {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select(['id', 'numeric_id'])
-			->from('storages')
-			->where($queryBuilder->expr()->like(
-				'id',
-				// match all 'shared::' + 32 characters storages
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
-				IQueryBuilder::PARAM_STR)
-			)
-			->andWhere($queryBuilder->expr()->notLike(
-				'id',
-				// but not the ones starting with a '/', they are for normal shares
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
-				IQueryBuilder::PARAM_STR)
-			)->orderBy('numeric_id');
-		$query = $queryBuilder->execute();
-
-		$remoteStorages = [];
-
-		while ($row = $query->fetch()) {
-			$remoteStorages[$row['id']] = $row['numeric_id'];
-		}
-
-		return $remoteStorages;
-	}
-
-	public function getRemoteShareIds() {
-		$queryBuilder = $this->connection->getQueryBuilder();
-		$queryBuilder->select(['id', 'share_token', 'owner', 'remote'])
-			->from('share_external');
-		$query = $queryBuilder->execute();
-
-		$remoteShareIds = [];
-
-		while ($row = $query->fetch()) {
-			$cloudId = $this->cloudIdManager->getCloudId($row['owner'], $row['remote']);
-			$remote = $cloudId->getRemote();
-
-			$remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $remote);
-		}
-
-		return $remoteShareIds;
-	}
+    /**
+     * @var IDBConnection
+     */
+    protected $connection;
+
+    /**
+     * @var ICloudIdManager
+     */
+    private $cloudIdManager;
+
+    public function __construct(IDBConnection $connection, ICloudIdManager $cloudIdManager) {
+        $this->connection = $connection;
+        $this->cloudIdManager = $cloudIdManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('sharing:cleanup-remote-storages')
+            ->setDescription('Cleanup shared storage entries that have no matching entry in the shares_external table')
+            ->addOption(
+                'dry-run',
+                null,
+                InputOption::VALUE_NONE,
+                'only show which storages would be deleted'
+            );
+    }
+
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $remoteStorages = $this->getRemoteStorages();
+
+        $output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
+
+        $remoteShareIds = $this->getRemoteShareIds();
+
+        $output->writeln(count($remoteShareIds) . ' remote share(s) exist');
+
+        foreach ($remoteShareIds as $id => $remoteShareId) {
+            if (isset($remoteStorages[$remoteShareId])) {
+                if ($input->getOption('dry-run') || $output->isVerbose()) {
+                    $output->writeln("<info>$remoteShareId belongs to remote share $id</info>");
+                }
+
+                unset($remoteStorages[$remoteShareId]);
+            } else {
+                $output->writeln("<comment>$remoteShareId for share $id has no matching storage, yet</comment>");
+            }
+        }
+
+        if (empty($remoteStorages)) {
+            $output->writeln('<info>no storages deleted</info>');
+        } else {
+            $dryRun = $input->getOption('dry-run');
+            foreach ($remoteStorages as $id => $numericId) {
+                if ($dryRun) {
+                    $output->writeln("<error>$id [$numericId] can be deleted</error>");
+                    $this->countFiles($numericId, $output);
+                } else {
+                    $this->deleteStorage($id, $numericId, $output);
+                }
+            }
+        }
+        return 0;
+    }
+
+    public function countFiles($numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select($queryBuilder->func()->count('fileid'))
+            ->from('filecache')
+            ->where($queryBuilder->expr()->eq(
+                'storage',
+                $queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $result = $queryBuilder->execute();
+        $count = $result->fetchOne();
+        $output->writeln("$count files can be deleted for storage $numericId");
+    }
+
+    public function deleteStorage($id, $numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->delete('storages')
+            ->where($queryBuilder->expr()->eq(
+                'id',
+                $queryBuilder->createNamedParameter($id, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $output->write("deleting $id [$numericId] ... ");
+        $count = $queryBuilder->execute();
+        $output->writeln("deleted $count storage");
+        $this->deleteFiles($numericId, $output);
+    }
+
+    public function deleteFiles($numericId, OutputInterface $output) {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->delete('filecache')
+            ->where($queryBuilder->expr()->eq(
+                'storage',
+                $queryBuilder->createNamedParameter($numericId, IQueryBuilder::PARAM_STR),
+                IQueryBuilder::PARAM_STR)
+            );
+        $output->write("deleting files for storage $numericId ... ");
+        $count = $queryBuilder->execute();
+        $output->writeln("deleted $count files");
+    }
+
+    public function getRemoteStorages() {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select(['id', 'numeric_id'])
+            ->from('storages')
+            ->where($queryBuilder->expr()->like(
+                'id',
+                // match all 'shared::' + 32 characters storages
+                $queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
+                IQueryBuilder::PARAM_STR)
+            )
+            ->andWhere($queryBuilder->expr()->notLike(
+                'id',
+                // but not the ones starting with a '/', they are for normal shares
+                $queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
+                IQueryBuilder::PARAM_STR)
+            )->orderBy('numeric_id');
+        $query = $queryBuilder->execute();
+
+        $remoteStorages = [];
+
+        while ($row = $query->fetch()) {
+            $remoteStorages[$row['id']] = $row['numeric_id'];
+        }
+
+        return $remoteStorages;
+    }
+
+    public function getRemoteShareIds() {
+        $queryBuilder = $this->connection->getQueryBuilder();
+        $queryBuilder->select(['id', 'share_token', 'owner', 'remote'])
+            ->from('share_external');
+        $query = $queryBuilder->execute();
+
+        $remoteShareIds = [];
+
+        while ($row = $query->fetch()) {
+            $cloudId = $this->cloudIdManager->getCloudId($row['owner'], $row['remote']);
+            $remote = $cloudId->getRemote();
+
+            $remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $remote);
+        }
+
+        return $remoteShareIds;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -69,11 +69,11 @@ 
 	public function execute(InputInterface $input, OutputInterface $output): int {
 		$remoteStorages = $this->getRemoteStorages();
 
-		$output->writeln(count($remoteStorages) . ' remote storage(s) need(s) to be checked');
+		$output->writeln(count($remoteStorages).' remote storage(s) need(s) to be checked');
 
 		$remoteShareIds = $this->getRemoteShareIds();
 
-		$output->writeln(count($remoteShareIds) . ' remote share(s) exist');
+		$output->writeln(count($remoteShareIds).' remote share(s) exist');
 
 		foreach ($remoteShareIds as $id => $remoteShareId) {
 			if (isset($remoteStorages[$remoteShareId])) {
@@ -151,13 +151,13 @@ 
 			->where($queryBuilder->expr()->like(
 				'id',
 				// match all 'shared::' + 32 characters storages
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::') . str_repeat('_', 32)),
+				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::').str_repeat('_', 32)),
 				IQueryBuilder::PARAM_STR)
 			)
 			->andWhere($queryBuilder->expr()->notLike(
 				'id',
 				// but not the ones starting with a '/', they are for normal shares
-				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/') . '%'),
+				$queryBuilder->createNamedParameter($this->connection->escapeLikeParameter('shared::/').'%'),
 				IQueryBuilder::PARAM_STR)
 			)->orderBy('numeric_id');
 		$query = $queryBuilder->execute();
@@ -183,7 +183,7 @@ 
 			$cloudId = $this->cloudIdManager->getCloudId($row['owner'], $row['remote']);
 			$remote = $cloudId->getRemote();
 
-			$remoteShareIds[$row['id']] = 'shared::' . md5($row['share_token'] . '@' . $remote);
+			$remoteShareIds[$row['id']] = 'shared::'.md5($row['share_token'].'@'.$remote);
 		}
 
 		return $remoteShareIds;