Use xz2 crate instead of a custom implementation (#306)

* Use `xz2` crate for xz decompression

* Add support for xz encoding

* Fix new clippy warning

Author: a1phyr

Cargo.toml

@@ -49,6 +49,7 @@ zstd = { version = "0.13", optional = true, default-features = false }
 zopfli = { version = "0.8", optional = true }
 deflate64 = { version = "0.1.9", optional = true }
 lzma-rs = { version = "0.3", default-features = false, optional = true }
+xz2 = { version = "0.1.7", optional = true }
 
 [target.'cfg(any(all(target_arch = "arm", target_pointer_width = "32"), target_arch = "mips", target_arch = "powerpc"))'.dependencies]
 crossbeam-utils = "0.8.20"
@@ -80,7 +81,7 @@ deflate-zopfli = ["zopfli", "_deflate-any"]
 nt-time = ["dep:nt-time"]
 lzma = ["lzma-rs/stream"]
 unreserved = []
-xz = ["lzma-rs/raw_decoder"]
+xz = ["dep:xz2"]
 default = [
     "aes-crypto",
     "bzip2",

src/compression.rs

@@ -187,6 +187,8 @@ pub const SUPPORTED_COMPRESSION_METHODS: &[CompressionMethod] = &[
     CompressionMethod::Bzip2,
     #[cfg(feature = "zstd")]
     CompressionMethod::Zstd,
+    #[cfg(feature = "xz")]
+    CompressionMethod::Xz,
 ];
 
 pub(crate) enum Decompressor<R: io::BufRead> {
@@ -202,7 +204,7 @@ pub(crate) enum Decompressor<R: io::BufRead> {
     #[cfg(feature = "lzma")]
     Lzma(Box<crate::read::lzma::LzmaDecoder<R>>),
     #[cfg(feature = "xz")]
-    Xz(crate::read::xz::XzDecoder<R>),
+    Xz(xz2::bufread::XzDecoder<R>),
 }
 
 impl<R: io::BufRead> io::Read for Decompressor<R> {
@@ -246,7 +248,7 @@ impl<R: io::BufRead> Decompressor<R> {
                 Decompressor::Lzma(Box::new(crate::read::lzma::LzmaDecoder::new(reader)))
             }
             #[cfg(feature = "xz")]
-            CompressionMethod::Xz => Decompressor::Xz(crate::read::xz::XzDecoder::new(reader)),
+            CompressionMethod::Xz => Decompressor::Xz(xz2::bufread::XzDecoder::new(reader)),
             _ => {
                 return Err(crate::result::ZipError::UnsupportedArchive(
                     "Compression method not supported",

src/read.rs

@@ -35,9 +35,6 @@ pub(crate) mod stream;
 #[cfg(feature = "lzma")]
 pub(crate) mod lzma;
 
-#[cfg(feature = "xz")]
-pub(crate) mod xz;
-
 pub(crate) mod magic_finder;
 
 // Put the struct declaration in a private module to convince rustdoc to display ZipArchive nicely

src/read/xz.rs

@@ -99,6 +99,8 @@ enum GenericZipWriter<W: Write + Seek> {
     Bzip2(BzEncoder<MaybeEncrypted<W>>),
     #[cfg(feature = "zstd")]
     Zstd(ZstdEncoder<'static, MaybeEncrypted<W>>),
+    #[cfg(feature = "xz")]
+    Xz(xz2::write::XzEncoder<MaybeEncrypted<W>>),
 }
 
 impl<W: Write + Seek> Debug for GenericZipWriter<W> {
@@ -118,6 +120,8 @@ impl<W: Write + Seek> Debug for GenericZipWriter<W> {
             GenericZipWriter::Bzip2(w) => f.write_fmt(format_args!("Bzip2({:?})", w.get_ref())),
             #[cfg(feature = "zstd")]
             GenericZipWriter::Zstd(w) => f.write_fmt(format_args!("Zstd({:?})", w.get_ref())),
+            #[cfg(feature = "xz")]
+            GenericZipWriter::Xz(w) => f.write_fmt(format_args!("Xz({:?})", w.get_ref())),
         }
     }
 }
@@ -1763,7 +1767,12 @@ impl<W: Write + Seek> GenericZipWriter<W> {
                 }
                 #[cfg(feature = "xz")]
                 CompressionMethod::Xz => {
-                    Err(UnsupportedArchive("XZ isn't supported for compression"))
+                    let level = clamp_opt(compression_level.unwrap_or(6), 0..=9)
+                        .ok_or(UnsupportedArchive("Unsupported compression level"))?
+                        as u32;
+                    Ok(Box::new(move |bare| {
+                        GenericZipWriter::Xz(xz2::write::XzEncoder::new(bare, level))
+                    }))
                 }
                 CompressionMethod::Unsupported(..) => {
                     Err(UnsupportedArchive("Unsupported compression"))
@@ -1788,6 +1797,8 @@ impl<W: Write + Seek> GenericZipWriter<W> {
             GenericZipWriter::Bzip2(w) => w.finish()?,
             #[cfg(feature = "zstd")]
             GenericZipWriter::Zstd(w) => w.finish()?,
+            #[cfg(feature = "xz")]
+            GenericZipWriter::Xz(w) => w.finish()?,
             Closed => {
                 return Err(io::Error::new(
                     io::ErrorKind::BrokenPipe,
@@ -1813,6 +1824,8 @@ impl<W: Write + Seek> GenericZipWriter<W> {
             GenericZipWriter::Bzip2(ref mut w) => Some(w as &mut dyn Write),
             #[cfg(feature = "zstd")]
             GenericZipWriter::Zstd(ref mut w) => Some(w as &mut dyn Write),
+            #[cfg(feature = "xz")]
+            GenericZipWriter::Xz(ref mut w) => Some(w as &mut dyn Write),
             Closed => None,
         }
     }