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

[unpackfs] Use callback instead of building giant string in memory

Browse Source 
SEE #1740

By processing each line in turn (and just counting is) rather
than collecting all of the lines of output from the tools,
we end up with lower memory usage.
This commit is contained in:
Adriaan de Groot 2021-11-03 16:09:11 +01:00
parent e8209089c6
commit 94039c19bb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,24 +79,24 @@ class UnpackEntry:
"""
Counts the number of files this entry has.
"""
fslist = ""
# Need a name we can use like a global
class counter(object):
count = 0
def cb_count(s):
counter.count += 1
if self.sourcefs == "squashfs":
fslist = subprocess.check_output(
["unsquashfs", "-l", self.source]
)
libcalamares.utils.host_env_process_output(["unsquashfs", "-l", self.source], cb_count)
elif self.sourcefs == "ext4":
fslist = subprocess.check_output(
["find", self.mountPoint, "-type", "f"]
)
libcalamares.utils.host_env_process_output(["find", self.mountPoint, "-type", "f"], cb_count)
elif self.is_file():
# Hasn't been mounted, copy directly; find handles both
# files and directories.
fslist = subprocess.check_output(["find", self.source, "-type", "f"])
libcalamares.utils.host_env_process_output(["find", self.source, "-type", "f"], cb_count)
self.total = len(fslist.splitlines())
self.total = counter.count
return self.total
def do_mount(self, base):