1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-26 09:47:58 +00:00

archives list: use iso8601 timestamp format with --json

like yyyy-mm-ddThh:mm:ss - no tz yet, this likely needs more refactoring
to tz aware and utc datetime objects everywhere, currently there are
naive datetime objects and also localtime at quite some places.
This commit is contained in:
Thomas Waldmann 2017-08-06 02:13:17 +02:00
parent 09c111bb44
commit 1df7af58ae

View file

@ -549,6 +549,7 @@ def __init__(self, format, repository, manifest, key, *, json=False):
if self.json:
self.item_data = {}
self.format_item = self.format_item_json
self.format_time = self.format_time_json
else:
self.item_data = static_keys
@ -565,8 +566,8 @@ def get_item_data(self, archive_info):
'archive': remove_surrogates(archive_info.name),
'barchive': archive_info.name,
'id': bin_to_hex(archive_info.id),
'time': format_time(to_localtime(archive_info.ts)),
'start': format_time(to_localtime(archive_info.ts)),
'time': self.format_time(archive_info.ts),
'start': self.format_time(archive_info.ts),
})
for key in self.used_call_keys:
item_data[key] = self.call_keys[key]()
@ -584,7 +585,15 @@ def get_comment(self, rs):
return remove_surrogates(self.archive.comment) if rs else self.archive.comment
def get_ts_end(self):
return format_time(to_localtime(self.archive.ts_end))
return self.format_time(self.archive.ts_end)
def format_time(self, ts):
t = to_localtime(ts)
return format_time(t)
def format_time_json(self, ts):
t = to_localtime(ts)
return isoformat_time(t)
class ItemFormatter(BaseFormatter):