inline dwarfs library to replace external dependency

Author: QaidVoid

Cargo.lock

@@ -77,7 +77,12 @@ fn main() {
                             fs::create_dir_all(write_path).unwrap();
                             let output_path = write_path.join(file_name);
                             match appimage.write_entry(&desktop, &output_path) {
-                                Ok(_) => log!(args.quiet, "Wrote {} to {}", desktop.path.display(), output_path.display()),
+                                Ok(_) => log!(
+                                    args.quiet,
+                                    "Wrote {} to {}",
+                                    desktop.path.display(),
+                                    output_path.display()
+                                ),
                                 Err(e) => elog!(args.quiet, "Failed to write desktop: {}", e),
                             }
                         } else {
@@ -94,7 +99,12 @@ fn main() {
                             fs::create_dir_all(write_path).unwrap();
                             let output_path = write_path.join(file_name);
                             match appimage.write_entry(&icon, &output_path) {
-                                Ok(_) => log!(args.quiet, "Wrote {} to {}", icon.path.display(), output_path.display()),
+                                Ok(_) => log!(
+                                    args.quiet,
+                                    "Wrote {} to {}",
+                                    icon.path.display(),
+                                    output_path.display()
+                                ),
                                 Err(e) => elog!(args.quiet, "Failed to write icon: {}", e),
                             }
                         } else {
@@ -111,7 +121,12 @@ fn main() {
                             fs::create_dir_all(write_path).unwrap();
                             let output_path = write_path.join(file_name);
                             match appimage.write_entry(&appstream, &output_path) {
-                                Ok(_) => log!(args.quiet, "Wrote {} to {}", appstream.path.display(), output_path.display()),
+                                Ok(_) => log!(
+                                    args.quiet,
+                                    "Wrote {} to {}",
+                                    appstream.path.display(),
+                                    output_path.display()
+                                ),
                                 Err(e) => elog!(args.quiet, "Failed to write appstream: {}", e),
                             }
                         } else {

squishy-cli/src/main.rs

@@ -16,11 +16,27 @@ path = "src/lib.rs"
 default = []
 appimage = ["goblin", "rayon"]
 rayon = ["dep:rayon"]
-dwarfs = ["dep:dwarfs"]
+dwarfs = [
+    "dep:bstr",
+    "dep:lru",
+    "dep:positioned-io",
+    "dep:serde",
+    "dep:sha2",
+    "dep:xxhash-rust",
+    "dep:zerocopy",
+    "dep:zstd-safe",
+]
 
 [dependencies]
 backhand = "0.24.0"
-dwarfs = { version = "0.2.1", optional = true }
+bstr = { version = "1.12.0", features = ["serde"], optional = true }
 goblin = { version = "0.10.4", default-features = false, features = ["elf32", "elf64", "endian_fd", "std"], optional = true }
+lru = { version = "0.14.0", optional = true }
+positioned-io = { version = "0.3.4", default-features = false, optional = true }
 rayon = { version = "1.11.0", optional = true }
+serde = { version = "1.0.219", features = ["derive"], optional = true }
+sha2 = { version = "0.10.9", optional = true }
 thiserror = "2.0.17"
+xxhash-rust = { version = "0.8.15", features = ["xxh3"], optional = true }
+zerocopy = { version = "0.8.25", features = ["derive", "std"], optional = true }
+zstd-safe = { version = "7.2.4", default-features = false, optional = true }

squishy/Cargo.toml

@@ -243,20 +243,16 @@ impl<'a> AppImage<'a> {
                 }))
             }
             #[cfg(feature = "dwarfs")]
-            AppImageFS::DwarFS(dwarfs) => {
-                Box::new(dwarfs.entries().map(|entry| AppImageEntry {
-                    path: entry.path.clone(),
-                    size: entry.size,
-                    kind: match &entry.kind {
-                        DwarFSEntryKind::File => AppImageEntryKind::File,
-                        DwarFSEntryKind::Directory => AppImageEntryKind::Directory,
-                        DwarFSEntryKind::Symlink(target) => {
-                            AppImageEntryKind::Symlink(target.clone())
-                        }
-                        _ => AppImageEntryKind::Unknown,
-                    },
-                }))
-            }
+            AppImageFS::DwarFS(dwarfs) => Box::new(dwarfs.entries().map(|entry| AppImageEntry {
+                path: entry.path.clone(),
+                size: entry.size,
+                kind: match &entry.kind {
+                    DwarFSEntryKind::File => AppImageEntryKind::File,
+                    DwarFSEntryKind::Directory => AppImageEntryKind::Directory,
+                    DwarFSEntryKind::Symlink(target) => AppImageEntryKind::Symlink(target.clone()),
+                    _ => AppImageEntryKind::Unknown,
+                },
+            })),
         }
     }