Add zip support and bump release to 0.1.1

Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 name = "qstract"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 authors = ["harmless-tech"]
-description = "Extract tars"
+description = "A basic tar/zip extraction program"
 readme = "README.md"
 license = "MIT"
 repository = "https://github.com/cargo-prebuilt/qstract"
 keywords = ["binary", "tar"]
-rust-version = "1.63"
+rust-version = "1.74"
 include = [
     "src/",
     "build.rs",
@@ -24,6 +24,7 @@ include = [
 anyhow = "1.0.80"
 flate2 = "1.0.28"
 pico-args = { version = "0.5.0", features = ["eq-separator"] }
+rc-zip-sync = { version = "4.0.0", default-features = false, features = ["deflate", "deflate64"] }
 tar = "0.4.40"
 
 [profile.release]

README.md

@@ -4,7 +4,7 @@
 [![Rust Checks](https://github.com/cargo-prebuilt/qstract/actions/workflows/checks.yml/badge.svg?event=push)](https://github.com/cargo-prebuilt/qstract/actions/workflows/checks.yml)
 [![rustc-msrv](https://img.shields.io/badge/rustc-1.63%2B-blue?logo=rust)](https://www.rust-lang.org/tools/install)
 
-A very simple tar extraction program.
+A basic tar/zip extraction program.
 
 ## Installation
 
@@ -13,14 +13,14 @@ A very simple tar extraction program.
 <!-- - Cargo prebuilt: ```cargo prebuilt qstract``` -->
 - Cargo binstall: ```cargo binstall qstract --no-confirm```
 - Cargo quickinstall: ```cargo quickinstall qstract```
-- Homebrew: ```brew install crow-rest/harmless/qstract```
 - Install script (unix platforms): ```curl --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-prebuilt/qstract/main/scripts/install-qstract.sh | bash```
 <!-- - For github actions you can use [cargo-prebuilt/cargo-prebuilt-action](https://github.com/cargo-prebuilt/cargo-prebuilt-action) -->
 
 ## Args
 
 - `-C` for directory to extract to.
 - `-z` for gzip.
+- `--zip` for zip. (Only deflate and deflate64)
 
 First positional arg is the file to extract.
 

deny.toml

@@ -92,6 +92,8 @@ allow = [
     "MIT",
     "Apache-2.0",
     #"Apache-2.0 WITH LLVM-exception",
+    "Unicode-DFS-2016",
+    "BSD-3-Clause"
 ]
 # The confidence threshold for detecting a license from license text.
 # The higher the value, the more closely the license text must be to the

src/main.rs

@@ -1,6 +1,6 @@
 use flate2::bufread::GzDecoder;
+use rc_zip_sync::{rc_zip::parse::EntryKind, ReadZip};
 use std::{
-    env,
     fs::File,
     io::{BufReader, Read},
     path::PathBuf,
@@ -20,13 +20,15 @@ FLAGS:
 OPTIONS:
   -z           Extract gzip compressed file
   -C [DIR]     Extract to [DIR]
+  --zip       Extract zip compressed file (none, deflate, deflate64)
 
 ARGS:
   <FILE>       Tar file to extract
 ";
 
 struct Args {
     gzip: bool,
+    zip: bool,
     output: PathBuf,
     input: PathBuf,
 }
@@ -46,25 +48,66 @@ fn main() -> anyhow::Result<()> {
 
     let args = Args {
         gzip: pargs.contains("-z"),
+        zip: pargs.contains("--zip"),
         output: if let Some(p) =
             pargs.opt_value_from_os_str("-C", |s| Ok::<PathBuf, String>(PathBuf::from(s)))?
         {
             p
         }
         else {
-            env::current_dir()?
+            std::env::current_dir()?
         },
         input: pargs.free_from_os_str(|s| Ok::<PathBuf, String>(PathBuf::from(s)))?,
     };
 
+    if args.gzip && args.zip {
+        panic!("Cannot use gzip and zip at the same time.");
+    }
+
     let file = File::open(args.input)?;
     let file = BufReader::new(file);
 
-    let file: Box<dyn Read> =
+    let mut file: Box<dyn Read> =
         if args.gzip { Box::new(GzDecoder::new(file)) } else { Box::new(file) };
 
-    let mut archive = Archive::new(file);
-    archive.unpack(args.output)?;
+    if !args.zip {
+        let mut archive = Archive::new(file);
+        archive.unpack(args.output)?;
+    }
+    else {
+        unzip(&mut file, args.output)?;
+    }
+
+    Ok(())
+}
+
+fn unzip(read: &mut Box<dyn Read>, output: PathBuf) -> anyhow::Result<()> {
+    let mut bytes = Vec::new();
+    read.read_to_end(&mut bytes)?;
+    let reader = bytes.read_zip()?;
+
+    for entry in reader.entries() {
+        let name = match entry.sanitized_name() {
+            Some(name) => name,
+            None => continue,
+        };
+
+        match entry.kind() {
+            EntryKind::Directory => {
+                let path = output.join(name);
+                std::fs::create_dir_all(path.parent().expect("No parent path."))?;
+            }
+            EntryKind::File => {
+                let path = output.join(name);
+                std::fs::create_dir_all(path.parent().expect("No parent path."))?;
+
+                let mut w = File::create(path)?;
+                let mut r = entry.reader();
+                std::io::copy(&mut r, &mut w)?;
+            }
+            EntryKind::Symlink => eprintln!("Unsupported symlink, skipping {}", name),
+        }
+    }
 
     Ok(())
 }

test/_test.sh

@@ -84,11 +84,53 @@ function test_2 {
 function test_3 {
     $QSTRACT_BIN t3archive.tar
     b101_files ./ff
+    rm -rf ./ff
+}
+
+function test_4 {
+    $QSTRACT_BIN --zip ./zarchive1.zip -C ./t1
+    10_files ./t1
+    rm -rf ./t1
+
+    $QSTRACT_BIN ./zarchive1.zip -C ./ --zip
+    10_files ./
+    rm -rf *.txt
+
+    $QSTRACT_BIN -C ./t555/111 --zip ./zarchive1.zip
+    10_files ./t555/111
+    rm -rf ./t555
+}
+
+function test_5 {
+    $QSTRACT_BIN --zip ./7z-zarchive1.zip -C ./t1
+    10_files ./t1
+    rm -rf ./t1
+
+    $QSTRACT_BIN ./7z-zarchive1.zip -C ./ --zip
+    10_files ./
+    rm -rf *.txt
+
+    $QSTRACT_BIN -C ./t555/111 --zip ./7z-zarchive1.zip
+    10_files ./t555/111
+    rm -rf ./t555
+}
+
+function test_6 {
+    $QSTRACT_BIN --zip nocomp1.zip
+    b101_files ./ff
+    rm -rf ./ff
+
+    $QSTRACT_BIN --zip nocomp1.zip -C ./ttf
+    b101_files ./ttf/ff
+    rm -rf ./ttf/ff
 }
 
 test_1
 test_2
 test_3
+test_4
+test_5
+test_6
 
 popd
 rm -rf "$TEMP_DIR"