Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace $verbose with VERBOSITY_VERBOSE for scanFiles method #11968

Merged
merged 2 commits into from
Nov 6, 2018

Conversation

kesselb
Copy link
Contributor

@kesselb kesselb commented Oct 21, 2018

Follow-up #11831

This pr replace if ($verbose) with OutputInterface::VERBOSITY_VERBOSE

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb added the 3. to review Waiting for reviews label Oct 21, 2018
@kesselb kesselb added this to the Nextcloud 15 milestone Oct 21, 2018
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't mix such changes. Let's just adjust the verbosity output logic in this PR.

}
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function($path) use ($output) {
$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', function ($path) use ($output) {
$output->writeln("\tFile\t<info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please don't change these unrelated commands. It's fine to fix/enhance this in another PR though.

});

$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', function ($path) use ($output) {
$output->writeln("\tFolder\t<info>$path</info>", OutputInterface::VERBOSITY_VERBOSE);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same


$output->writeln("\nScanning AppData for files");
$output->writeln('Scanning AppData for files');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

@@ -213,7 +178,6 @@ public function exceptionErrorHandler($severity, $message, $file, $line) {
protected function presentStats(OutputInterface $output) {
// Stop the timer
$this->execTime += microtime(true);
$output->writeln("");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't change the command logic (post increment, output formatting) in this PR 😉

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@MorrisJobke
Copy link
Member

Let's close this one in favor of #11831

@MorrisJobke MorrisJobke closed this Nov 5, 2018
@MorrisJobke MorrisJobke deleted the feature/noid/drop-verbose-appscan branch November 5, 2018 23:35
@MorrisJobke MorrisJobke restored the feature/noid/drop-verbose-appscan branch November 5, 2018 23:35
@MorrisJobke MorrisJobke reopened this Nov 5, 2018
@MorrisJobke
Copy link
Member

Let's close this one in favor of #11831

I just realized that it is for a different command.

Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍 Code looks good

@MorrisJobke MorrisJobke mentioned this pull request Nov 6, 2018
29 tasks
@kesselb
Copy link
Contributor Author

kesselb commented Nov 6, 2018

@ChristophWurst 🏓

@kesselb kesselb merged commit ccd89f3 into master Nov 6, 2018
@ChristophWurst ChristophWurst deleted the feature/noid/drop-verbose-appscan branch November 6, 2018 13:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants