diff --git a/crates/jean/src/main.rs b/crates/jean/src/main.rs index 750099e..569419f 100644 --- a/crates/jean/src/main.rs +++ b/crates/jean/src/main.rs @@ -78,7 +78,9 @@ fn do_main(cli: Cli) -> Result<(), Box> { println!("Comment:\n{}", comment); } let has_zip64 = archive.entries().any(|entry| entry.inner.is_zip64); - println!("{}", if has_zip64 { "Zip64" } else { "Zip32" }); + if has_zip64 { + println!("Found Zip64 end of central directory locator") + } let mut creator_versions = HashSet::::new(); let mut reader_versions = HashSet::::new(); diff --git a/crates/rc-zip/src/format/archive.rs b/crates/rc-zip/src/format/archive.rs index d131b31..2f75494 100644 --- a/crates/rc-zip/src/format/archive.rs +++ b/crates/rc-zip/src/format/archive.rs @@ -288,6 +288,9 @@ pub enum Method { /// [DEFLATE (RFC 1951)](https://www.ietf.org/rfc/rfc1951.txt) Deflate = 8, + /// [DEFLATE64]( + Deflate64 = 9, + /// [BZIP-2](https://github.com/dsnet/compress/blob/master/doc/bzip2-format.pdf) Bzip2 = 12, diff --git a/crates/rc-zip/src/format/directory_header.rs b/crates/rc-zip/src/format/directory_header.rs index 85d2da0..6d80a14 100644 --- a/crates/rc-zip/src/format/directory_header.rs +++ b/crates/rc-zip/src/format/directory_header.rs @@ -142,7 +142,6 @@ impl DirectoryHeader { needs_uncompressed_size: self.uncompressed_size == !0u32, needs_header_offset: self.header_offset == !0u32, }; - trace!("extra field settings: {:#?}", settings); let mut slice = &self.extra.0[..]; while !slice.is_empty() { diff --git a/crates/rc-zip/testdata/test-zips/found-me-bzip2.zip b/crates/rc-zip/testdata/test-zips/found-me-bzip2.zip new file mode 100644 index 0000000..73707ad Binary files /dev/null and b/crates/rc-zip/testdata/test-zips/found-me-bzip2.zip differ diff --git a/crates/rc-zip/testdata/test-zips/found-me-deflate64.zip b/crates/rc-zip/testdata/test-zips/found-me-deflate64.zip new file mode 100644 index 0000000..7c902ae Binary files /dev/null and b/crates/rc-zip/testdata/test-zips/found-me-deflate64.zip differ diff --git a/crates/rc-zip/testdata/test-zips/found-me-lzma.zip b/crates/rc-zip/testdata/test-zips/found-me-lzma.zip new file mode 100644 index 0000000..8f6398c Binary files /dev/null and b/crates/rc-zip/testdata/test-zips/found-me-lzma.zip differ