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

[unpackfs] Refactor counting an entry

Browse Source 
- This does not have to live in the Operation
- Uses only the local imgmountdir (where the entry is mounted)
This commit is contained in:
Adriaan de Groot 2020-04-04 23:10:22 +02:00
parent d55a5bde98
commit 49a584377e
1 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,6 +77,33 @@ class UnpackEntry:
def is_file(self):
return self.sourcefs == "file"
def do_count(self, imgmountdir):
fslist = ""
if self.sourcefs == "squashfs":
if shutil.which("unsquashfs") is None:
utils.warning("Failed to find unsquashfs")
return (_("Failed to unpack image \"{}\"").format(self.source),
_("Failed to find unsquashfs, make sure you have the squashfs-tools package installed"))
fslist = subprocess.check_output(
["unsquashfs", "-l", self.source]
)
elif self.sourcefs == "ext4":
fslist = subprocess.check_output(
["find", imgmountdir, "-type", "f"]
)
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"])
self.total = len(fslist.splitlines())
return self.total
ON_POSIX = 'posix' in sys.builtin_module_names
@ -240,30 +267,7 @@ class UnpackOperation:
self.mount_image(entry, imgmountdir)
fslist = ""
if entry.sourcefs == "squashfs":
if shutil.which("unsquashfs") is None:
utils.warning("Failed to find unsquashfs")
return (_("Failed to unpack image \"{}\"").format(entry.source),
_("Failed to find unsquashfs, make sure you have the squashfs-tools package installed"))
fslist = subprocess.check_output(
["unsquashfs", "-l", entry.source]
)
elif entry.sourcefs == "ext4":
fslist = subprocess.check_output(
["find", imgmountdir, "-type", "f"]
)
elif entry.is_file():
# Hasn't been mounted, copy directly; find handles both
# files and directories.
fslist = subprocess.check_output(["find", entry.source, "-type", "f"])
entry.total = len(fslist.splitlines())
entry.do_count(imgmountdir) # Fill in the entry.total
self.report_progress()
error_msg = self.unpack_image(entry, imgmountdir)