napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[unpackfs] Improve progress reporting

Browse Source 
- don't rely on exactly 100 files being copied (thanks to Kevin Kofler)
This commit is contained in:
Adriaan de Groot 2020-01-20 19:39:05 +01:00
parent c482990bc5
commit 10d1c4cf5b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/unpackfs/main.py
View File

@ -132,6 +132,9 @@ def file_copy(source, entry, progress_cb):
process = subprocess.Popen( process = subprocess.Popen(
args, env=at_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX args, env=at_env, bufsize=1, stdout=subprocess.PIPE, close_fds=ON_POSIX
) )
# last_num_files_copied trails num_files_copied, and whenever at least 100 more
# files have been copied, progress is reported and last_num_files_copied is updated.
last_num_files_copied = 0
for line in iter(process.stdout.readline, b''): for line in iter(process.stdout.readline, b''):
# rsync outputs progress in parentheses. Each line will have an # rsync outputs progress in parentheses. Each line will have an
@ -157,7 +160,8 @@ def file_copy(source, entry, progress_cb):
num_files_copied = num_files_total_local - num_files_remaining num_files_copied = num_files_total_local - num_files_remaining
# I guess we're updating every 100 files... # I guess we're updating every 100 files...
if num_files_copied % 100 == 0: if num_files_copied - last_num_files_copied >= 100:
last_num_files_copied = num_files_copied
progress_cb(num_files_copied, num_files_total_local) progress_cb(num_files_copied, num_files_total_local)
process.wait() process.wait()