Merge pull request #20673 from nextcloud/enh/tweaks-app-data-scan
Set exit code if something went wrong.
This commit is contained in:
commit
c69686a29d
|
@ -81,20 +81,20 @@ class ScanAppData extends Base {
|
|||
}
|
||||
}
|
||||
|
||||
protected function scanFiles(OutputInterface $output, string $folder) {
|
||||
protected function scanFiles(OutputInterface $output, string $folder): int {
|
||||
try {
|
||||
$appData = $this->getAppDataFolder();
|
||||
} catch (NotFoundException $e) {
|
||||
$output->writeln('NoAppData folder found');
|
||||
return;
|
||||
$output->writeln('<error>NoAppData folder found</error>');
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ($folder !== '') {
|
||||
try {
|
||||
$appData = $appData->get($folder);
|
||||
} catch (NotFoundException $e) {
|
||||
$output->writeln('Could not find folder: ' . $folder);
|
||||
return;
|
||||
$output->writeln('<error>Could not find folder: ' . $folder . '</error>');
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -130,16 +130,22 @@ class ScanAppData extends Base {
|
|||
$scanner->scan($appData->getPath());
|
||||
} catch (ForbiddenException $e) {
|
||||
$output->writeln('<error>Storage not writable</error>');
|
||||
$output->writeln('Make sure you\'re running the scan command only as the user the web server runs as');
|
||||
$output->writeln('<info>Make sure you\'re running the scan command only as the user the web server runs as</info>');
|
||||
return 1;
|
||||
} catch (InterruptedException $e) {
|
||||
# exit the function if ctrl-c has been pressed
|
||||
$output->writeln('Interrupted by user');
|
||||
$output->writeln('<info>Interrupted by user</info>');
|
||||
return 1;
|
||||
} catch (NotFoundException $e) {
|
||||
$output->writeln('<error>Path not found: ' . $e->getMessage() . '</error>');
|
||||
return 1;
|
||||
} catch (\Exception $e) {
|
||||
$output->writeln('<error>Exception during scan: ' . $e->getMessage() . '</error>');
|
||||
$output->writeln('<error>' . $e->getTraceAsString() . '</error>');
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
@ -149,16 +155,19 @@ class ScanAppData extends Base {
|
|||
$output->setVerbosity(OutputInterface::VERBOSITY_VERBOSE);
|
||||
}
|
||||
|
||||
$output->writeln("\nScanning AppData for files");
|
||||
$output->writeln('Scanning AppData for files');
|
||||
$output->writeln('');
|
||||
|
||||
$folder = $input->getArgument('folder');
|
||||
|
||||
$this->initTools();
|
||||
|
||||
$this->scanFiles($output, $folder);
|
||||
|
||||
$exitCode = $this->scanFiles($output, $folder);
|
||||
if ($exitCode === 0) {
|
||||
$this->presentStats($output);
|
||||
}
|
||||
return $exitCode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialises some useful tools for the Command
|
||||
|
@ -196,7 +205,6 @@ class ScanAppData extends Base {
|
|||
protected function presentStats(OutputInterface $output) {
|
||||
// Stop the timer
|
||||
$this->execTime += microtime(true);
|
||||
$output->writeln("");
|
||||
|
||||
$headers = [
|
||||
'Folders', 'Files', 'Elapsed time'
|
||||
|
|
Loading…
Reference in New Issue