Skip to content

Commit e0e6950

Browse files
committed
Improve layout of migration script and print time
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
1 parent 0612c9f commit e0e6950

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

core/Command/Maintenance/RepairMultibucketPreviews.php

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,20 +106,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
106106
$output->writeln("");
107107
$progressBar = new ProgressBar($output, $total);
108108
$progressBar->setFormat("%current%/%max% [%bar%] %percent:3s%% %elapsed:6s%/%estimated:-6s% Memory: %memory:6s% \n %message%");
109-
$progressBar->setMessage("Starting …");
110-
$progressBar->maxSecondsBetweenRedraws(0.1);
109+
$time = (new \DateTime())->format('H:i:s');
110+
$progressBar->setMessage("$time Starting …");
111+
$progressBar->maxSecondsBetweenRedraws(0.2);
112+
$progressBar->setOverwrite(false);
111113
$progressBar->start();
112114
$hexDigits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
113115

114116
foreach ($directoryListing as $oldPreviewFolder) {
115117
pcntl_signal_dispatch();
116118
$name = $oldPreviewFolder->getName();
117-
$output->writeln("");
118-
$output->writeln("");
119-
$progressBar->setMessage("Migrating $name");
119+
$time = (new \DateTime())->format('H:i:s');
120+
$progressBar->setMessage("$time Migrating $name");
120121

121122
if ($this->stopSignalReceived) {
122-
$progressBar->setMessage("Stopping migration …");
123+
$progressBar->setMessage("$time Stopping migration …");
123124
return 0;
124125
}
125126
if (!$oldPreviewFolder instanceof Folder) {
@@ -144,7 +145,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
144145
}
145146
$oldPreviewFolder->delete();
146147
} else { // new folder structure
147-
$progressBar->setMessage("Traversing the new folder structure folder …");
148+
$time = (new \DateTime())->format('H:i:s');
149+
$progressBar->setMessage("$time Traversing the new folder structure folder …");
148150
if (in_array($name, $hexDigits)) {
149151
$dirListing1 = $oldPreviewFolder->getDirectoryListing();
150152
foreach ($dirListing1 as $dir2) {
@@ -220,7 +222,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
220222
$fileId = $dir8->getName();
221223
$total += 1;
222224
$progressBar->setMaxSteps($total);
223-
$progressBar->setMessage("Migrating $fileId");
225+
$time = (new \DateTime())->format('H:i:s');
226+
$progressBar->setMessage("$time: Migrating $fileId");
224227

225228
$newFoldername = "$name/" . $dir2->getName() . "/" . $dir3->getName() . "/" . $dir4->getName() .
226229
"/" . $dir5->getName() . "/" . $dir6->getName() . "/" . $dir7->getName() . "/" . $fileId;

0 commit comments

Comments
 (0)