Parameter of RepairAdvanceEvent is actually an increment, not a step id

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/33640/head
Côme Chilliet 2 years ago
parent 652ab6da3f
commit 9a29025534
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A

@ -127,7 +127,7 @@ class Repair extends Command {
if ($event instanceof RepairStartEvent) {
$this->progress->start($event->getMaxStep());
} elseif ($event instanceof RepairAdvanceEvent) {
$this->progress->advance($event->getCurrentStep());
$this->progress->advance($event->getIncrement());
} elseif ($event instanceof RepairFinishEvent) {
$this->progress->finish();
$this->output->writeln('');

@ -137,7 +137,7 @@ class Upgrade extends Command {
if (!empty($desc)) {
$progress->setMessage($desc);
}
$progress->advance($event->getCurrentStep());
$progress->advance($event->getIncrement());
} elseif ($event instanceof RepairFinishEvent) {
$progress->setMessage('Done');
$progress->finish();

@ -76,7 +76,7 @@ class FeedBackHandler {
$this->progressStateStep = 0;
$this->currentStep = $event->getCurrentStepName();
} elseif ($event instanceof RepairAdvanceEvent) {
$this->progressStateStep += $event->getCurrentStep();
$this->progressStateStep += $event->getIncrement();
$desc = $event->getDescription();
if (empty($desc)) {
$desc = $this->currentStep;

@ -279,7 +279,7 @@ class Repair implements IOutput {
}
/**
* @param int $step
* @param int $step number of step to advance
* @param string $description
*/
public function advance($step = 1, $description = '') {

@ -27,20 +27,19 @@ namespace OC\Repair\Events;
use OCP\EventDispatcher\Event;
class RepairAdvanceEvent extends Event {
// TODO Is that current step or step increment?
private int $current;
private int $increment;
private string $description;
public function __construct(
int $current,
int $increment,
string $description
) {
$this->current = $current;
$this->increment = $increment;
$this->description = $description;
}
public function getCurrentStep(): int {
return $this->current;
public function getIncrement(): int {
return $this->increment;
}
public function getDescription(): string {

@ -460,7 +460,7 @@ class Updater extends BasicEmitter {
if (empty($desc)) {
$desc = '';
}
$log->info(get_class($event).': ' . $desc . ' (' . $event->getCurrentStep() . ')', ['app' => 'updater']);
$log->info(get_class($event).': ' . $desc . ' (' . $event->getIncrement() . ')', ['app' => 'updater']);
} elseif ($event instanceof RepairFinishEvent) {
$log->info(get_class($event), ['app' => 'updater']);
} elseif ($event instanceof RepairStepEvent) {

Loading…
Cancel
Save