mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-07 06:59:38 +00:00
Code Issues Releases Wiki Activity

Optimize default listing

Browse source
This commit is contained in:
Teemu Toivanen 2016-02-03 11:34:56 +02:00
parent 14f0fa6f6a
commit 1b76c3902f
1 changed files with 50 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
borg/archiver.py
View file

@ -442,10 +442,16 @@ def do_list(self, args):
for item in archive.iter_items():
print(remove_surrogates(item[b'path']))
else:
longformat="{mode} {user:6} {group:6} {size:8d} {isomtime} {path}{extra}{NEWLINE}"
longformat="{mode} {user:6} {group:6} {size:8d} {isomtime} {path}{extra}"
userformat=longformat
"""use_user_format flag is used to speed up default listing.
When user issues format options, listing is a bit slower, but more keys are available and
precalculated
"""
use_user_format=False
if args.listformat:
userformat=args.listformat
userformat=args.listformat
use_user_format=True
archive_name=archive.name
@ -458,10 +464,13 @@ def do_list(self, args):
size = sum(size for _, size, _ in item[b'chunks'])
except KeyError:
pass
atime=safe_timestamp(item[b'atime'])
ctime=safe_timestamp(item[b'ctime'])
mtime=safe_timestamp(item[b'mtime'])
if use_user_format:
atime=safe_timestamp(item[b'atime'])
ctime=safe_timestamp(item[b'ctime'])
if b'source' in item:
source = item[b'source']
if type == 'l':
@ -472,38 +481,44 @@ def do_list(self, args):
else:
extra = ''
source = ''
formatdata={
'mode': mode,
'bmode': item[b'mode'],
'type': type,
'source': source,
'linktarget': source,
'user': item[b'user'] or item[b'uid'],
'uid': item[b'uid'],
'group': item[b'group'] or item[b'gid'],
'gid': item[b'gid'],
'size': size,
'isomtime': format_time(mtime),
'mtime': mtime,
'isoctime': format_time(ctime),
'ctime': ctime,
'isoatime': format_time(atime),
'atime': atime,
'path': remove_surrogates(item[b'path']),
'extra': extra,
'archivename': archive_name,
'SPACE': " ",
'TAB': "\t",
'LF': "\n",
'CR': "\r",
'NEWLINE': os.linesep,
'formatkeys': ()
}
formatdata["formatkeys"]=list(formatdata.keys())
print(format_line(userformat, formatdata), end='')
formatdata={
'mode': mode,
'user': item[b'user'] or item[b'uid'],
'group': item[b'group'] or item[b'gid'],
'size': size,
'isomtime': format_time(mtime),
'path': remove_surrogates(item[b'path']),
'extra': extra,
}
if use_user_format:
formatdata_user_format={
'bmode': item[b'mode'],
'type': type,
'source': source,
'linktarget': source,
'uid': item[b'uid'],
'gid': item[b'gid'],
'mtime': mtime,
'isoctime': format_time(ctime),
'ctime': ctime,
'isoatime': format_time(atime),
'atime': atime,
'archivename': archive_name,
'SPACE': " ",
'TAB': "\t",
'LF': "\n",
'CR': "\r",
'NEWLINE': os.linesep,
'formatkeys': ()
}
formatdata_user_format["formatkeys"]=list(formatdata.keys())
formatdata.update(formatdata_user_format)
if use_user_format:
print(format_line(userformat, formatdata), end='')
else:
print(format_line(userformat, formatdata))
else:
for archive_info in manifest.list_archive_infos(sort_by='ts'):