upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #56871 from nextcloud/backport/56869/stable31

Browse source
This commit is contained in:
Benjamin Gaussorgues 2025-12-09 10:24:43 +01:00 committed by GitHub
commit 2c8ab5f4e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/files/lib/Command/RepairTree.php
View file

@ -8,9 +8,11 @@ declare(strict_types=1);
*/
namespace OCA\Files\Command;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class RepairTree extends Command {
@ -26,11 +28,16 @@ class RepairTree extends Command {
$this
->setName('files:repair-tree')
->setDescription('Try and repair malformed filesystem tree structures')
->addOption('dry-run');
->addOption('dry-run')
->addOption('storage-id', 's', InputOption::VALUE_OPTIONAL, 'If set, only repair files within the given storage numeric ID', null)
->addOption('path', 'p', InputOption::VALUE_OPTIONAL, 'If set, only repair files within the given path', null);
}
public function execute(InputInterface $input, OutputInterface $output): int {
$rows = $this->findBrokenTreeBits();
$rows = $this->findBrokenTreeBits(
$input->getOption('storage-id'),
$input->getOption('path'),
);
$fix = !$input->getOption('dry-run');
$output->writeln('Found ' . count($rows) . ' file entries with an invalid path');
@ -88,7 +95,7 @@ class RepairTree extends Command {
$query->execute();
}
private function findBrokenTreeBits(): array {
private function findBrokenTreeBits(?string $storageId, ?string $path): array {
$query = $this->connection->getQueryBuilder();
$query->select('f.fileid', 'f.path', 'f.parent', 'f.name')
@ -108,6 +115,14 @@ class RepairTree extends Command {
$query->expr()->neq('f.storage', 'p.storage')
));
if ($storageId !== null) {
$query->andWhere($query->expr()->eq('f.storage', $query->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)));
}
if ($path !== null) {
$query->andWhere($query->expr()->like('f.path', $query->createNamedParameter($path . '%')));
}
return $query->execute()->fetchAll();
}
}