squashfs_zstd support

additionally, fixup squashfs compression and decompression
dol-sen · Oct 26, 2020 · f033f1c · f033f1c
1 parent ae26248
commit f033f1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/DeComp/compress.py b/DeComp/compress.py
@@ -417,9 +417,10 @@ def _sqfs(self, infodict):
                 self.extension(cmdinfo["mode"])
 
         sqfs_opts = self._sub_other_options(cmdlist.args, cmdinfo)
-        if not infodict['arch']:
-            sqfs_opts.remove("-Xbcj")
-            sqfs_opts.remove("%(arch)s")
+        if infodict['mode'] == "squashfs_xz":
+	        if not infodict['arch']:
+                    sqfs_opts.remove("-Xbcj")
+                    sqfs_opts.remove("%(arch)s")
         opts = ' '.join(sqfs_opts) % (cmdinfo)
         args = ' '.join([cmdlist.cmd, opts])
 

diff --git a/DeComp/definitions.py b/DeComp/definitions.py
@@ -226,6 +226,14 @@ class functions do.
                 ],
                 "GZIP", ["tar.gz"], {"tar"},
               ],
+    "squashfs_zstd": [
+                    "_sqfs", "mksquashfs",
+                    [
+                        "%(basedir)s/%(source)s", "%(filename)s", "-comp", "zstd",
+                        "-Xcompression-level", "19", "-b", "1M", "-no-recovery", "-noappend", "other_options"
+                    ],
+                    "SQUASHFS", ["squashfs", "sfs"], {"mksquashfs"},
+                ],
     "squashfs_xz": [
                     "_sqfs", "mksquashfs",
                     [
@@ -376,8 +384,8 @@ class functions do.
     "squashfs": [
                     "_common", "unsquashfs",
                     [
-                        "other_options", "-d", "%(destination)s",
-                        "%(basedir)s/%(source)s"
+                        "other_options", "-f", "-d", "%(destination)s",
+                        "%(source)s"
                     ],
                     "SQUASHFS", ["squashfs", "sfs"], {"unsquashfs"},
                 ],