mirror of https://github.com/borgbackup/borg.git
Flip ProgressIndicatorPercent same_line default to True
Every production use of this uses same_line=True
This commit is contained in:
parent
8709cec57c
commit
5924915d35
|
@ -640,7 +640,7 @@ Number of files: {0.stats.nfiles}'''.format(
|
||||||
try:
|
try:
|
||||||
unpacker = msgpack.Unpacker(use_list=False)
|
unpacker = msgpack.Unpacker(use_list=False)
|
||||||
items_ids = self.metadata.items
|
items_ids = self.metadata.items
|
||||||
pi = ProgressIndicatorPercent(total=len(items_ids), msg="Decrementing references %3.0f%%", same_line=True)
|
pi = ProgressIndicatorPercent(total=len(items_ids), msg="Decrementing references %3.0f%%")
|
||||||
for (i, (items_id, data)) in enumerate(zip(items_ids, self.repository.get_many(items_ids))):
|
for (i, (items_id, data)) in enumerate(zip(items_ids, self.repository.get_many(items_ids))):
|
||||||
if progress:
|
if progress:
|
||||||
pi.show(i)
|
pi.show(i)
|
||||||
|
@ -1033,7 +1033,7 @@ class ArchiveChecker:
|
||||||
logger.info('Starting cryptographic data integrity verification...')
|
logger.info('Starting cryptographic data integrity verification...')
|
||||||
count = len(self.chunks)
|
count = len(self.chunks)
|
||||||
errors = 0
|
errors = 0
|
||||||
pi = ProgressIndicatorPercent(total=count, msg="Verifying data %6.2f%%", step=0.01, same_line=True)
|
pi = ProgressIndicatorPercent(total=count, msg="Verifying data %6.2f%%", step=0.01)
|
||||||
for chunk_id, (refcount, *_) in self.chunks.iteritems():
|
for chunk_id, (refcount, *_) in self.chunks.iteritems():
|
||||||
pi.show()
|
pi.show()
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -492,7 +492,7 @@ class Archiver:
|
||||||
self.print_warning('%s: %s', remove_surrogates(orig_path), e)
|
self.print_warning('%s: %s', remove_surrogates(orig_path), e)
|
||||||
|
|
||||||
if not args.dry_run:
|
if not args.dry_run:
|
||||||
pi = ProgressIndicatorPercent(total=len(dirs), msg='Setting directory permissions %3.0f%%', same_line=True)
|
pi = ProgressIndicatorPercent(total=len(dirs), msg='Setting directory permissions %3.0f%%')
|
||||||
while dirs:
|
while dirs:
|
||||||
pi.show()
|
pi.show()
|
||||||
dir_item = dirs.pop(-1)
|
dir_item = dirs.pop(-1)
|
||||||
|
|
|
@ -1105,7 +1105,7 @@ def yes(msg=None, false_msg=None, true_msg=None, default_msg=None,
|
||||||
|
|
||||||
|
|
||||||
class ProgressIndicatorPercent:
|
class ProgressIndicatorPercent:
|
||||||
def __init__(self, total, step=5, start=0, same_line=False, msg="%3.0f%%"):
|
def __init__(self, total, step=5, start=0, same_line=True, msg="%3.0f%%"):
|
||||||
"""
|
"""
|
||||||
Percentage-based progress indicator
|
Percentage-based progress indicator
|
||||||
|
|
||||||
|
|
|
@ -536,7 +536,7 @@ class Repository:
|
||||||
self.prepare_txn(index_transaction_id, do_cleanup=False)
|
self.prepare_txn(index_transaction_id, do_cleanup=False)
|
||||||
try:
|
try:
|
||||||
segment_count = sum(1 for _ in self.io.segment_iterator())
|
segment_count = sum(1 for _ in self.io.segment_iterator())
|
||||||
pi = ProgressIndicatorPercent(total=segment_count, msg="Replaying segments %3.0f%%", same_line=True)
|
pi = ProgressIndicatorPercent(total=segment_count, msg="Replaying segments %3.0f%%")
|
||||||
for i, (segment, filename) in enumerate(self.io.segment_iterator()):
|
for i, (segment, filename) in enumerate(self.io.segment_iterator()):
|
||||||
pi.show(i)
|
pi.show(i)
|
||||||
if index_transaction_id is not None and segment <= index_transaction_id:
|
if index_transaction_id is not None and segment <= index_transaction_id:
|
||||||
|
@ -636,7 +636,7 @@ class Repository:
|
||||||
segments_transaction_id = self.io.get_segments_transaction_id()
|
segments_transaction_id = self.io.get_segments_transaction_id()
|
||||||
self.prepare_txn(None) # self.index, self.compact, self.segments all empty now!
|
self.prepare_txn(None) # self.index, self.compact, self.segments all empty now!
|
||||||
segment_count = sum(1 for _ in self.io.segment_iterator())
|
segment_count = sum(1 for _ in self.io.segment_iterator())
|
||||||
pi = ProgressIndicatorPercent(total=segment_count, msg="Checking segments %3.1f%%", step=0.1, same_line=True)
|
pi = ProgressIndicatorPercent(total=segment_count, msg="Checking segments %3.1f%%", step=0.1)
|
||||||
for i, (segment, filename) in enumerate(self.io.segment_iterator()):
|
for i, (segment, filename) in enumerate(self.io.segment_iterator()):
|
||||||
pi.show(i)
|
pi.show(i)
|
||||||
if segment > transaction_id:
|
if segment > transaction_id:
|
||||||
|
|
|
@ -887,7 +887,7 @@ def test_progress_percentage_multiline(capfd):
|
||||||
|
|
||||||
|
|
||||||
def test_progress_percentage_sameline(capfd):
|
def test_progress_percentage_sameline(capfd):
|
||||||
pi = ProgressIndicatorPercent(1000, step=5, start=0, same_line=True, msg="%3.0f%%")
|
pi = ProgressIndicatorPercent(1000, step=5, start=0, msg="%3.0f%%")
|
||||||
pi.show(0)
|
pi.show(0)
|
||||||
out, err = capfd.readouterr()
|
out, err = capfd.readouterr()
|
||||||
assert err == ' 0%\r'
|
assert err == ' 0%\r'
|
||||||
|
|
|
@ -77,7 +77,7 @@ class AtticRepositoryUpgrader(Repository):
|
||||||
replace the 8 first bytes of all regular files in there."""
|
replace the 8 first bytes of all regular files in there."""
|
||||||
logger.info("converting %d segments..." % len(segments))
|
logger.info("converting %d segments..." % len(segments))
|
||||||
segment_count = len(segments)
|
segment_count = len(segments)
|
||||||
pi = ProgressIndicatorPercent(total=segment_count, msg="Converting segments %3.0f%%", same_line=True)
|
pi = ProgressIndicatorPercent(total=segment_count, msg="Converting segments %3.0f%%")
|
||||||
for i, filename in enumerate(segments):
|
for i, filename in enumerate(segments):
|
||||||
if progress:
|
if progress:
|
||||||
pi.show(i)
|
pi.show(i)
|
||||||
|
|
Loading…
Reference in New Issue