From a8831f4978d3084561ad0199073ba2ca16e6e327 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 29 Feb 2020 20:39:27 +0100 Subject: [PATCH] fix ProgressIndicator msgids, fixes #4935 add some to code, fix docs. --- docs/internals/frontends.rst | 6 +++++- src/borg/archive.py | 3 ++- src/borg/upgrader.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/internals/frontends.rst b/docs/internals/frontends.rst index 3a5c4fd13..a948d8c16 100644 --- a/docs/internals/frontends.rst +++ b/docs/internals/frontends.rst @@ -549,13 +549,17 @@ Operations *info* is one string element, the name of the archive currently synced. - repository.compact_segments - repository.replay_segments - - repository.check_segments + - repository.check - check.verify_data + - check.rebuild_manifest - extract *info* is one string element, the name of the path currently extracted. - extract.permissions - archive.delete + - archive.calc_stats + - prune + - upgrade.convert_segments Prompts BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK diff --git a/src/borg/archive.py b/src/borg/archive.py index 5e64f51cc..9edb72cfb 100644 --- a/src/borg/archive.py +++ b/src/borg/archive.py @@ -596,7 +596,8 @@ Utilization of max. archive size: {csize_max:.0%} archive_index = ChunkIndex() sync = CacheSynchronizer(archive_index) add(self.id) - pi = ProgressIndicatorPercent(total=len(self.metadata.items), msg='Calculating statistics... %3d%%') + pi = ProgressIndicatorPercent(total=len(self.metadata.items), msg='Calculating statistics... %3d%%', + msgid='archive.calc_stats') for id, chunk in zip(self.metadata.items, self.repository.get_many(self.metadata.items)): pi.show(increase=1) add(id) diff --git a/src/borg/upgrader.py b/src/borg/upgrader.py index 4e3fe576f..fc0851f32 100644 --- a/src/borg/upgrader.py +++ b/src/borg/upgrader.py @@ -79,7 +79,7 @@ class AtticRepositoryUpgrader(Repository): replace the 8 first bytes of all regular files in there.""" logger.info("converting %d segments..." % len(segments)) segment_count = len(segments) - pi = ProgressIndicatorPercent(total=segment_count, msg="Converting segments %3.0f%%") + pi = ProgressIndicatorPercent(total=segment_count, msg="Converting segments %3.0f%%", msgid='upgrade.convert_segments') for i, filename in enumerate(segments): if progress: pi.show(i)