UX improvement

nextcloud · Oct 5, 2021 · 217d863 · 217d863
1 parent 37be9a1
commit 217d863
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/lib/Command/FileSearch.php b/lib/Command/FileSearch.php
@@ -144,12 +144,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
 						$empty = false;
 						foreach ($files as $file) {
-							$output->writeln(
-								'   found <info>' . $file->getName() . '</info> ('
+							$output->writeln('');
+							$output->write(
+								'   > found <info>' . $file->getName() . '</info> ('
 								. $this->humanReadable($file->getFilesize()) . ') in <info>'
 								. $data->getName() . '</info>/<info>' . $chunk->getName() . '</info>'
 							);
+							$progressBar->setProgress(0);
 						}
+						$output->writeln('');
 					} catch
 					(ArchiveCreateException
 					| ArchiveNotFoundException

diff --git a/lib/Command/PointRestore.php b/lib/Command/PointRestore.php
@@ -381,9 +381,9 @@ private function restoreUniqueFile(
 		$root = $data->getAbsolutePath();
 		$chunk = $file->getRestoringChunk();
 		$this->output->write(
-			'   > restoring ' . $file->getName() . ' (' . $this->humanReadable($file->getFilesize())
-			. ') from <info>'
-			. $chunk->getPath() . $chunk->getName() . '</info>'
+			'   > restoring ' . $file->getName() . ' (' . $this->humanReadable($file->getFilesize()) .
+			') from <info>' . $chunk->getPath() . $chunk->getName() . '</info>' .
+			' (rewind: ' . $this->getDateDiff($point->getDate(), time()) . '): '
 		);
 
 		// TODO: display $root and add a confirmation step