robertvokac/bitrot
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Activity

performance and usability updates

Browse Source 
- report the size of the data read
- only update the counter when it changes
- consistent quotation marks
This commit is contained in:
Łukasz Langa 2013-03-04 01:41:45 +01:00
parent ebcf6a5926
commit 6035421d39
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/bitrot.py
View File

@ -75,6 +75,7 @@ def run(verbosity=1):
error_count = 0 error_count = 0
total_size = 0 total_size = 0
current_size = 0 current_size = 0
last_reported_size = ''
missing_paths = set() missing_paths = set()
cur.execute('SELECT path FROM bitrot') cur.execute('SELECT path FROM bitrot')
row = cur.fetchone() row = cur.fetchone()
@ -96,11 +97,14 @@ def run(verbosity=1):
new_mtime = int(st.st_mtime) new_mtime = int(st.st_mtime)
current_size += st.st_size current_size += st.st_size
if verbosity: if verbosity:
sys.stdout.write('\r{:>6.1%}'.format(current_size/total_size)) size_fmt = '\r{:>6.1%}'.format(current_size/total_size)
sys.stdout.flush() if size_fmt != last_reported_size:
sys.stdout.write(size_fmt)
sys.stdout.flush()
last_reported_size = size_fmt
new_sha1 = sha1(p) new_sha1 = sha1(p)
update_ts = datetime.datetime.utcnow().strftime( update_ts = datetime.datetime.utcnow().strftime(
"%Y-%m-%d %H:%M:%S%z" '%Y-%m-%d %H:%M:%S%z'
) )
p_uni = p.decode('utf8') p_uni = p.decode('utf8')
missing_paths.discard(p_uni) missing_paths.discard(p_uni)
@ -136,11 +140,11 @@ def run(verbosity=1):
conn.commit() conn.commit()
elif stored_sha1 != new_sha1: elif stored_sha1 != new_sha1:
error_count += 1 error_count += 1
print("\rerror: SHA1 mismatch for {}: expected {}, got {}." print('\rerror: SHA1 mismatch for {}: expected {}, got {}.'
" Original info from {}.".format( ' Original info from {}.'.format(
p, stored_sha1, new_sha1, update_ts p, stored_sha1, new_sha1, update_ts
), ),
file=sys.stderr, file=sys.stderr,
) )
for path in missing_paths: for path in missing_paths:
cur.execute('DELETE FROM bitrot WHERE path=?', (path,)) cur.execute('DELETE FROM bitrot WHERE path=?', (path,))
@ -148,34 +152,35 @@ def run(verbosity=1):
cur.execute('SELECT COUNT(path) FROM bitrot') cur.execute('SELECT COUNT(path) FROM bitrot')
all_count = cur.fetchone()[0] all_count = cur.fetchone()[0]
if verbosity: if verbosity:
print("\rFinished. {} errors found.".format(error_count)) print('\rFinished. {:.2f} MiB of data read. {} errors found.'
''.format(total_size/1024/1024, error_count))
if verbosity == 1: if verbosity == 1:
print("{} entries in the database, {} new, {} updated, " print('{} entries in the database, {} new, {} updated, '
"{} renamed, {} missing.".format(all_count, len(new_paths), '{} renamed, {} missing.'.format(all_count, len(new_paths),
len(updated_paths), len(renamed_paths), len(missing_paths) len(updated_paths), len(renamed_paths), len(missing_paths)
)) ))
elif verbosity > 1: elif verbosity > 1:
print("{} entries in the database.".format(all_count), end=' ') print('{} entries in the database.'.format(all_count), end=' ')
if new_paths: if new_paths:
print("{} entries new:".format(len(new_paths))) print('{} entries new:'.format(len(new_paths)))
new_paths.sort() new_paths.sort()
for path in new_paths: for path in new_paths:
print(" ", path) print(' ', path)
if updated_paths: if updated_paths:
print("{} entries updated:".format(len(updated_paths))) print('{} entries updated:'.format(len(updated_paths)))
updated_paths.sort() updated_paths.sort()
for path in updated_paths: for path in updated_paths:
print(" ", path) print(' ', path)
if renamed_paths: if renamed_paths:
print("{} entries renamed:".format(len(renamed_paths))) print('{} entries renamed:'.format(len(renamed_paths)))
renamed_paths.sort() renamed_paths.sort()
for path in renamed_paths: for path in renamed_paths:
print(" from", path[0], "to", path[1]) print(' from', path[0], 'to', path[1])
if missing_paths: if missing_paths:
print("{} entries missing:".format(len(missing_paths))) print('{} entries missing:'.format(len(missing_paths)))
missing_paths = sorted(missing_paths) missing_paths = sorted(missing_paths)
for path in missing_paths: for path in missing_paths:
print(" ", path) print(' ', path)
if not any((new_paths, updated_paths, missing_paths)): if not any((new_paths, updated_paths, missing_paths)):
print() print()
if error_count: if error_count: