voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use safeprint instead of always encoding to ascii.

Browse source
This commit is contained in:
voussoir 2021-01-28 16:50:40 -08:00
parent d9e1e6bf7c
commit 0cb90875bd
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
voussoirkit/spinal.py
View file

@ -8,6 +8,7 @@ from voussoirkit import bytestring
from voussoirkit import dotdict from voussoirkit import dotdict
from voussoirkit import pathclass from voussoirkit import pathclass
from voussoirkit import ratelimiter from voussoirkit import ratelimiter
from voussoirkit import safeprint
from voussoirkit import sentinel from voussoirkit import sentinel
from voussoirkit import winglob from voussoirkit import winglob
from voussoirkit import vlogging from voussoirkit import vlogging
@ -51,7 +52,6 @@ def callback_progress_v1(fpobj, written_bytes, total_bytes):
Prints "filename written/total (percent%)" Prints "filename written/total (percent%)"
''' '''
filename = fpobj.absolute_path.encode('ascii', 'replace').decode()
if written_bytes >= total_bytes: if written_bytes >= total_bytes:
ends = '\r\n' ends = '\r\n'
else: else:
@ -61,9 +61,8 @@ def callback_progress_v1(fpobj, written_bytes, total_bytes):
written = '{:,}'.format(written_bytes) written = '{:,}'.format(written_bytes)
total = '{:,}'.format(total_bytes) total = '{:,}'.format(total_bytes)
written = written.rjust(len(total), ' ') written = written.rjust(len(total), ' ')
status = '{filename} {written}/{total} ({percent}%)\r' status = f'{fpobj.absolute_path} {written}/{total} ({percent}%)\r'
status = status.format(filename=filename, written=written, total=total, percent=percent) safeprint.safeprint(status, end=ends)
print(status, end=ends)
sys.stdout.flush() sys.stdout.flush()
def copy(source, file_args=None, file_kwargs=None, dir_args=None, dir_kwargs=None): def copy(source, file_args=None, file_kwargs=None, dir_args=None, dir_kwargs=None):