From 95644ce8838415cfa14afb64cb5bd4b4e68d0915 Mon Sep 17 00:00:00 2001 From: George Lacey Date: Thu, 6 May 2021 08:10:11 +0100 Subject: [PATCH] Differentiate shortening and truncation --- src/borgmanager/summary/summary.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/borgmanager/summary/summary.py b/src/borgmanager/summary/summary.py index 0f11f57..cef744c 100644 --- a/src/borgmanager/summary/summary.py +++ b/src/borgmanager/summary/summary.py @@ -18,7 +18,7 @@ class Summary(object): return_string += f"{repo_name} ({repo.location}):\n" else: 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" return_string += f"\t> Un/Compressed size: {self.bytes_to_string(cache.unique_size)}" \ f"/{self.bytes_to_string(cache.unique_csize)}\n" @@ -66,7 +66,7 @@ class Summary(object): return weeks @staticmethod - def seconds_to_string(seconds: int, short=False): + def seconds_to_string(seconds: int, short=False, truncate=False): seconds = int(seconds) increments = [('year', 'yr', 31557600), ('week', 'wk', 604800), @@ -95,7 +95,7 @@ class Summary(object): time_string += f"{exact} {st}s, " else: time_string += f"{exact} {st}, " - if short: + if truncate: break return time_string.strip().strip(',')[::-1].replace(' ,', ' dna ', 1)[::-1]