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

[unpackfs] Report progress more carefully

Browse Source 
- Mark entries as totally-done
- Show a message when counting an entry
This commit is contained in:
Adriaan de Groot 2020-04-06 16:54:02 +02:00
parent f33c737e99
commit af0d04d523
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,11 @@ _ = gettext.translation("calamares-python",
def pretty_name(): def pretty_name():
return _("Filling up filesystems.") return _("Filling up filesystems.")
# This is going to be changed from various methods
status = pretty_name()
def pretty_status_message():
return status
class UnpackEntry: class UnpackEntry:
""" """
@ -229,6 +234,9 @@ def file_copy(source, entry, progress_cb):
process.wait() process.wait()
progress_cb(num_files_copied, num_files_total_local) # Push towards 100% progress_cb(num_files_copied, num_files_total_local) # Push towards 100%
# Mark this entry as really done
entry.copied = entry.total
# 23 is the return code rsync returns if it cannot write extended # 23 is the return code rsync returns if it cannot write extended
# attributes (with -X) because the target file system does not support it, # attributes (with -X) because the target file system does not support it,
# e.g., the FAT EFI system partition. We need -X because distributions # e.g., the FAT EFI system partition. We need -X because distributions
@ -280,13 +288,15 @@ class UnpackOperation:
done = entry.copied done = entry.copied
break break
if done > 0 and total > 0: if total > 0:
# Pretend that each entry represents an equal amount of work; # Pretend that each entry represents an equal amount of work;
# the complete ones count as 100% of their own fraction # the complete ones count as 100% of their own fraction
# (and have *not* been counted in total or done), while # (and have *not* been counted in total or done), while
# total/done represents the fraction of the current fraction. # total/done represents the fraction of the current fraction.
progress = ( 1.0 * complete / len(self.entries) ) + ( ( 1.0 / len(self.entries) ) * done / total ) progress = ( ( 1.0 * complete ) / len(self.entries) ) + ( ( 1.0 / len(self.entries) ) * ( 1.0 * done / total ) )
global status
status = _("Unpacking image {}/{}, file {}/{}").format((complete+1),len(self.entries),done, total)
job.setprogress(progress) job.setprogress(progress)
def run(self): def run(self):
@ -295,10 +305,14 @@ class UnpackOperation:
:return: :return:
""" """
global status
source_mount_path = tempfile.mkdtemp() source_mount_path = tempfile.mkdtemp()
try: try:
job.setprogress(0.0)
for entry in self.entries: for entry in self.entries:
status = _("Starting to unpack {}").format(entry.source)
job.setprogress(0.0)
entry.do_mount(source_mount_path) entry.do_mount(source_mount_path)
entry.do_count() # Fill in the entry.total entry.do_count() # Fill in the entry.total