Refactor xz/lzma decompression code

kpcyrd · Nov 11, 2024 · 053ce85 · 053ce85
1 parent e024e74
commit 053ce85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tools/Cargo.toml b/tools/Cargo.toml
@@ -21,7 +21,6 @@ structopt = "0.3.26"
 env_logger = "0.9.0"
 reqwest = { version="0.11.11", features=["json"] }
 chrono = { version = "0.4.19", features=["serde"] }
-rust-lzma = "0.5.1"
 tar = "0.4.38"
 flate2 = "1.0.24"
 serde = { version="1.0.137", features=["derive"] }
@@ -35,8 +34,8 @@ tokio = { version="1.19.2", features=["macros", "rt-multi-thread", "io-std", "io
 atty = "0.2.14"
 tree_magic_mini = "3.0.3"
 bzip2 = "0.4.3"
-xz = "0.1.0"
-zstd = { version = "0.11.2", features = ["pkg-config"] }
+xz2 = "0.1"
+zstd = { version = "0.13", features = ["pkg-config"] }
 regex = "1.5.6"
 url = "2.2.2"
 

diff --git a/tools/src/decompress.rs b/tools/src/decompress.rs
@@ -2,7 +2,7 @@ use rebuilderd_common::errors::*;
 use std::io::Read;
 use flate2::read::GzDecoder;
 use bzip2::read::BzDecoder;
-use xz::read::XzDecoder;
+use xz2::read::XzDecoder;
 
 #[derive(Debug, PartialEq, Eq)]
 pub enum CompressedWith {

diff --git a/tools/src/schedule/debian.rs b/tools/src/schedule/debian.rs
@@ -1,6 +1,6 @@
 use crate::args::PkgsSync;
 use crate::schedule::{Pkg, fetch_url_or_path};
-use lzma::LzmaReader;
+use xz2::read::XzDecoder;
 use rebuilderd_common::{PkgGroup, PkgArtifact};
 use rebuilderd_common::errors::*;
 use std::collections::HashMap;
@@ -194,7 +194,7 @@ impl AnyhowTryFrom<NewPkg> for DebianBinPkg {
 }
 
 pub fn extract_pkg<T: AnyhowTryFrom<NewPkg>>(bytes: &[u8]) -> Result<Vec<T>> {
-    let r = LzmaReader::new_decompressor(bytes)?;
+    let r = XzDecoder::new(bytes);
     let r = BufReader::new(r);
     extract_pkgs_uncompressed(r)
 }