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

[unpackfs] Also report progress every half-second, if possible

Browse Source 
This still won't help if there's one really huge file that takes
several seconds to write, but if there's a bunch of files together
that is less than a file_chunk_count but take more than a half-
second to write, update anyway
This commit is contained in:
Adriaan de Groot 2020-10-06 13:29:15 +02:00
parent 57fa51ecd9
commit 672e27564e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,8 @@ def file_copy(source, entry, progress_cb):
:param progress_cb: A callback function for progress reporting. :param progress_cb: A callback function for progress reporting.
Takes a number and a total-number. Takes a number and a total-number.
""" """
import time
dest = entry.destination dest = entry.destination
# Environment used for executing rsync properly # Environment used for executing rsync properly
@ -191,12 +193,13 @@ def file_copy(source, entry, progress_cb):
args, env=at_env, args, env=at_env,
stdout=subprocess.PIPE, close_fds=ON_POSIX stdout=subprocess.PIPE, close_fds=ON_POSIX
) )
# last_num_files_copied trails num_files_copied, and whenever at least 100 more # last_num_files_copied trails num_files_copied, and whenever at least 107 more
# files (file_count_chunk) have been copied, progress is reported and # files (file_count_chunk) have been copied, progress is reported and
# last_num_files_copied is updated. Pick a chunk size that isn't "tidy" # last_num_files_copied is updated. The chunk size isn't "tidy"
# so that all the digits of the progress-reported number change. # so that all the digits of the progress-reported number change.
# #
last_num_files_copied = 0 last_num_files_copied = 0
last_timestamp_reported = time.time()
file_count_chunk = 107 file_count_chunk = 107
for line in iter(process.stdout.readline, b''): for line in iter(process.stdout.readline, b''):
@ -222,9 +225,10 @@ def file_copy(source, entry, progress_cb):
# adjusting the offset so that progressbar can be continuesly drawn # adjusting the offset so that progressbar can be continuesly drawn
num_files_copied = num_files_total_local - num_files_remaining num_files_copied = num_files_total_local - num_files_remaining
# Update about once every 1% of this entry now = time.time()
if num_files_copied - last_num_files_copied >= file_count_chunk: if (num_files_copied - last_num_files_copied >= file_count_chunk) or (now - last_timestamp_reported > 0.5):
last_num_files_copied = num_files_copied last_num_files_copied = num_files_copied
last_timestamp_reported = now
progress_cb(num_files_copied, num_files_total_local) progress_cb(num_files_copied, num_files_total_local)
process.wait() process.wait()