feat: Replace liblzma with lzma-rust2

Replace the LZMA implementation from bindings to the `liblzma` to a
pure Rust implementation.

Author: sorairolake

CHANGELOG.md

@@ -27,11 +27,13 @@ Categories Used:
 - Provide Nushell completions (packages still need to install them) [\#827](https://github.com/ouch-org/ouch/pull/827) ([FrancescElies](https://github.com/FrancescElies))
 - Support `.lz` decompression [\#838](https://github.com/ouch-org/ouch/pull/838) ([zzzsyyy](https://github.com/zzzsyyy))
 - Support `.lzma` decompression (and fix `.lzma` being a wrong alias for `.xz`) [\#838](https://github.com/ouch-org/ouch/pull/838) ([zzzsyyy](https://github.com/zzzsyyy))
+- Support `.lz` compression [\#863](https://github.com/ouch-org/ouch/pull/863) ([sorairolake](https://github.com/sorairolake))
 
 ### Improvements
 
 - Give better error messages when archive extensions are invalid [\#817](https://github.com/ouch-org/ouch/pull/817) ([marcospb19](https://github.com/marcospb19))
 - Add aliases for `--password` flag (`--pass` and `--pw`) [\#847](https://github.com/ouch-org/ouch/pull/847) ([marcospb19](https://github.com/marcospb19))
+- Use `lzma-rust2` crate instead of `liblzma` crate [\#865](https://github.com/ouch-org/ouch/pull/865) ([sorairolake](https://github.com/sorairolake))
 
 ### Bug Fixes
 

Cargo.lock

@@ -6,6 +6,7 @@ authors = [
     "Vinícius Rodrigues Miguel <[email protected]>",
 ]
 edition = "2021"
+rust-version = "1.82.0"
 readme = "README.md"
 repository = "https://github.com/ouch-org/ouch"
 license = "MIT"
@@ -31,6 +32,7 @@ ignore = "0.4.23"
 libc = "0.2.155"
 linked-hash-map = "0.5.6"
 lz4_flex = "0.11.3"
+lzma-rust2 = "0.13.0"
 num_cpus = "1.16.0"
 once_cell = "1.20.2"
 rayon = "1.10.0"
@@ -41,7 +43,6 @@ tar = "0.4.42"
 tempfile = "3.10.1"
 time = { version = "0.3.36", default-features = false }
 unrar = { version = "0.5.7", optional = true }
-liblzma = "0.4"
 zip = { version = "0.6.6", default-features = false, features = [
     "time",
     "aes-crypto",

Cargo.toml

@@ -113,7 +113,7 @@ Output:
 
 | Format    | `.tar` | `.zip` | `7z` | `.gz` | `.xz` | `.lzma` | `.lz` | `.bz`, `.bz2` | `.bz3` | `.lz4` | `.sz` (Snappy) | `.zst` | `.rar` | `.br` |
 |:---------:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| Supported | ✓ | ✓¹ | ✓¹ | ✓² | ✓ | ✓⁴ | ✓⁴ | ✓ | ✓ | ✓ | ✓² | ✓² | ✓³ | ✓ |
+| Supported | ✓ | ✓¹ | ✓¹ | ✓² | ✓ | ✓⁴ | ✓ | ✓ | ✓ | ✓ | ✓² | ✓² | ✓³ | ✓ |
 
 ✓: Supports compression and decompression.
 
@@ -189,7 +189,6 @@ If you're downloading binaries from the [releases page](https://github.com/ouch-
 
 Otherwise, you'll need these libraries installed on your system:
 
-* [liblzma](https://www.7-zip.org/sdk.html)
 * [libbz2](https://www.sourceware.org/bzip2)
 * [libbz3](https://github.com/kspalaiologos/bzip3)
 * [libz](https://www.zlib.net)

README.md

@@ -73,14 +73,19 @@ pub fn compress_files(
                     reason: "LZMA1 compression is not supported in ouch, use .xz instead.".to_string(),
                 })
             }
-            Xz => Box::new(liblzma::write::XzEncoder::new(
-                encoder,
-                level.map_or(6, |l| (l as u32).clamp(0, 9)),
-            )),
+            Xz => {
+                let options = level.map_or_else(Default::default, |l| {
+                    lzma_rust2::XzOptions::with_preset((l as u32).clamp(0, 9))
+                });
+                let writer = lzma_rust2::XzWriter::new(encoder, options)?;
+                Box::new(writer.auto_finish())
+            }
             Lzip => {
-                return Err(crate::Error::UnsupportedFormat {
-                    reason: "Lzip compression is not supported in ouch.".to_string(),
-                })
+                let options = level.map_or_else(Default::default, |l| {
+                    lzma_rust2::LzipOptions::with_preset((l as u32).clamp(0, 9))
+                });
+                let writer = lzma_rust2::LzipWriter::new(encoder, options);
+                Box::new(writer.auto_finish())
             }
             Snappy => Box::new(
                 gzp::par::compress::ParCompress::<gzp::snap::Snap>::builder()

src/commands/compress.rs

@@ -128,15 +128,9 @@ pub fn decompress_file(options: DecompressOptions) -> crate::Result<()> {
                 Box::new(bzip3::read::Bz3Decoder::new(decoder)?)
             }
             Lz4 => Box::new(lz4_flex::frame::FrameDecoder::new(decoder)),
-            Lzma => Box::new(liblzma::read::XzDecoder::new_stream(
-                decoder,
-                liblzma::stream::Stream::new_lzma_decoder(u64::MAX).unwrap(),
-            )),
-            Xz => Box::new(liblzma::read::XzDecoder::new(decoder)),
-            Lzip => Box::new(liblzma::read::XzDecoder::new_stream(
-                decoder,
-                liblzma::stream::Stream::new_lzip_decoder(u64::MAX, 0).unwrap(),
-            )),
+            Lzma => Box::new(lzma_rust2::LzmaReader::new_mem_limit(decoder, u32::MAX, None)?),
+            Xz => Box::new(lzma_rust2::XzReader::new(decoder, true)),
+            Lzip => Box::new(lzma_rust2::LzipReader::new(decoder)?),
             Snappy => Box::new(snap::read::FrameDecoder::new(decoder)),
             Zstd => Box::new(zstd::stream::Decoder::new(decoder)?),
             Brotli => Box::new(brotli::Decompressor::new(decoder, BUFFER_CAPACITY)),

src/commands/decompress.rs

@@ -57,15 +57,9 @@ pub fn list_archive_contents(
                     Box::new(bzip3::read::Bz3Decoder::new(decoder).unwrap())
                 }
                 Lz4 => Box::new(lz4_flex::frame::FrameDecoder::new(decoder)),
-                Lzma => Box::new(liblzma::read::XzDecoder::new_stream(
-                    decoder,
-                    liblzma::stream::Stream::new_lzma_decoder(u64::MAX).unwrap(),
-                )),
-                Xz => Box::new(liblzma::read::XzDecoder::new(decoder)),
-                Lzip => Box::new(liblzma::read::XzDecoder::new_stream(
-                    decoder,
-                    liblzma::stream::Stream::new_lzip_decoder(u64::MAX, 0).unwrap(),
-                )),
+                Lzma => Box::new(lzma_rust2::LzmaReader::new_mem_limit(decoder, u32::MAX, None)?),
+                Xz => Box::new(lzma_rust2::XzReader::new(decoder, true)),
+                Lzip => Box::new(lzma_rust2::LzipReader::new(decoder)?),
                 Snappy => Box::new(snap::read::FrameDecoder::new(decoder)),
                 Zstd => Box::new(zstd::stream::Decoder::new(decoder)?),
                 Brotli => Box::new(brotli::Decompressor::new(decoder, BUFFER_CAPACITY)),

src/commands/list.rs

@@ -94,7 +94,7 @@ pub enum CompressionFormat {
     Lzip,
     /// .sz
     Snappy,
-    /// tar, tgz, tbz, tbz2, tbz3, txz, tlz4, tlzma, tsz, tzst
+    /// tar, tgz, tbz, tbz2, tbz3, txz, tlz, tlz4, tlzma, tsz, tzst
     Tar,
     /// .zst
     Zstd,

src/extension.rs

@@ -45,11 +45,11 @@ impl Display for EscapedPathDisplay<'_> {
 /// This is different from [`Path::display`].
 ///
 /// See <https://gist.github.com/marcospb19/ebce5572be26397cf08bbd0fd3b65ac1> for a comparison.
-pub fn path_to_str(path: &Path) -> Cow<str> {
+pub fn path_to_str(path: &Path) -> Cow<'_, str> {
     os_str_to_str(path.as_ref())
 }
 
-pub fn os_str_to_str(os_str: &OsStr) -> Cow<str> {
+pub fn os_str_to_str(os_str: &OsStr) -> Cow<'_, str> {
     let format = || {
         let text = format!("{os_str:?}");
         Cow::Owned(text.trim_matches('"').to_string())
@@ -83,7 +83,7 @@ pub fn pretty_format_list_of_paths(paths: &[impl AsRef<Path>]) -> String {
 }
 
 /// Display the directory name, but use "current directory" when necessary.
-pub fn nice_directory_display(path: &Path) -> Cow<str> {
+pub fn nice_directory_display(path: &Path) -> Cow<'_, str> {
     if path == Path::new(".") {
         Cow::Borrowed("current directory")
     } else {

src/utils/formatting.rs

@@ -32,6 +32,7 @@ enum DirectoryExtension {
     #[cfg(feature = "bzip3")]
     Tbz3,
     Tgz,
+    Tlz,
     Tlz4,
     Tsz,
     Txz,
@@ -48,6 +49,7 @@ enum FileExtension {
     #[cfg(feature = "bzip3")]
     Bz3,
     Gz,
+    Lz,
     Lz4,
     Sz,
     Xz,