george/borg-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Differentiate shortening and truncation

Browse Source
This commit is contained in:
George Lacey 2021-05-06 08:10:11 +01:00
parent 3514aae3aa
commit 95644ce883
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/borgmanager/summary/summary.py
View File

@ -18,7 +18,7 @@ class Summary(object):
return_string += f"{repo_name} ({repo.location}):\n" return_string += f"{repo_name} ({repo.location}):\n"
else: else:
return_string += f"{repo.location}:\n" return_string += f"{repo.location}:\n"
return_string += f"\t> Last backup: {self.seconds_to_string(latest_archive.seconds_since(), True)}" \ return_string += f"\t> Last backup: {self.seconds_to_string(latest_archive.seconds_since(), True, True)}" \
f" ago\n" f" ago\n"
return_string += f"\t> Un/Compressed size: {self.bytes_to_string(cache.unique_size)}" \ return_string += f"\t> Un/Compressed size: {self.bytes_to_string(cache.unique_size)}" \
f"/{self.bytes_to_string(cache.unique_csize)}\n" f"/{self.bytes_to_string(cache.unique_csize)}\n"
@ -66,7 +66,7 @@ class Summary(object):
return weeks return weeks
@staticmethod @staticmethod
def seconds_to_string(seconds: int, short=False): def seconds_to_string(seconds: int, short=False, truncate=False):
seconds = int(seconds) seconds = int(seconds)
increments = [('year', 'yr', 31557600), increments = [('year', 'yr', 31557600),
('week', 'wk', 604800), ('week', 'wk', 604800),
@ -95,7 +95,7 @@ class Summary(object):
time_string += f"{exact} {st}s, " time_string += f"{exact} {st}s, "
else: else:
time_string += f"{exact} {st}, " time_string += f"{exact} {st}, "
if short: if truncate:
break break
return time_string.strip().strip(',')[::-1].replace(' ,', ' dna ', 1)[::-1] return time_string.strip().strip(',')[::-1].replace(' ,', ' dna ', 1)[::-1]