diff options
author | Blaok <i@blaok.me> | 2018-05-18 14:50:32 -0700 |
---|---|---|
committer | Blaok <i@blaok.me> | 2018-05-18 14:50:32 -0700 |
commit | 21b9ad397817af96d6d4204642debd263233bdda (patch) | |
tree | 94b15267325722463ccb0485303f94aab5a5679c /apps/files | |
parent | 03a6f8e14e63a0abcf4ed8fbca12998bcbb59be3 (diff) | |
download | nextcloud-server-21b9ad397817af96d6d4204642debd263233bdda.tar.gz nextcloud-server-21b9ad397817af96d6d4204642debd263233bdda.zip |
feat: allow files:scan --shallow
Signed-off-by: Yuze Chi <i@blaok.me>
Diffstat (limited to 'apps/files')
-rw-r--r-- | apps/files/lib/Command/Scan.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/files/lib/Command/Scan.php b/apps/files/lib/Command/Scan.php index c3b63f053f5..fed7eb25653 100644 --- a/apps/files/lib/Command/Scan.php +++ b/apps/files/lib/Command/Scan.php @@ -97,6 +97,11 @@ class Scan extends Base { null, InputOption::VALUE_NONE, 'only scan files which are marked as not fully scanned' + )->addOption( + 'shallow', + null, + InputOption::VALUE_NONE, + 'do not scan folders recursively' ); } @@ -109,7 +114,7 @@ class Scan extends Base { } } - protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false) { + protected function scanFiles($user, $path, $verbose, OutputInterface $output, $backgroundScan = false, $recursive = true) { $connection = $this->reconnectToDatabase($output); $scanner = new \OC\Files\Utils\Scanner($user, $connection, \OC::$server->getLogger()); # check on each file/folder if there was a user interrupt (ctrl-c) and throw an exception @@ -158,7 +163,7 @@ class Scan extends Base { if ($backgroundScan) { $scanner->backgroundScan($path); } else { - $scanner->scan($path); + $scanner->scan($path, $recursive); } } catch (ForbiddenException $e) { $output->writeln("<error>Home storage for user $user not writable</error>"); @@ -231,7 +236,7 @@ class Scan extends Base { } $output->writeln("Starting scan for user $user_count out of $users_total ($user)"); # full: printout data if $verbose was set - $this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned')); + $this->scanFiles($user, $path, $verbose, $output, $input->getOption('unscanned'), ! $input->getOption('shallow')); } else { $output->writeln("<error>Unknown user $user_count $user</error>"); } |