Move to liblzma

rust/Cargo.toml

@@ -27,12 +27,12 @@ clap = { version = "4.2.1", features = ["derive"] }
 color-print = "0.3.4"
 hex = "0.4.3"
 indicatif = "0.17.3"
+liblzma = { version = "0.3.4", features = ["static"] }
 memmap2 = "0.7.0"
 nom = "7.1.3"
 nom-derive = "0.10.1"
 prost = "0.11.8"
 rayon = "1.7.0"
-rust-lzma = { version = "0.6.0", features = ["static"] }
 serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.115"
 sha2 = "0.10.6"

rust/src/core/extract.rs

@@ -11,7 +11,7 @@ use std::sync::{Arc, Mutex};
 
 use anyhow::{bail, ensure, Context as _, Result};
 use bzip2::read::BzDecoder;
-use lzma::LzmaReader;
+// use lzma::LzmaReader;
 use memmap2::{Mmap, MmapMut};
 use prost::Message as _;
 use rayon::ThreadPoolBuilder;
@@ -251,11 +251,14 @@ impl ExtractOptions {
                     .context("Error in REPLACE_BZ operation")
             }
             Some(Type::ReplaceXz) => {
-                let data = Self::extract_data(op, payload).context("Error extracting data")?;
-                let mut decoder = LzmaReader::new_decompressor(data)
-                    .context("Unable to initialize lzma decoder")?;
-                Self::run_op_replace(&mut decoder, &mut dst_extents, block_size)
-                    .context("Error in REPLACE_XZ operation")
+                todo!()
+                // let data = Self::extract_data(op, payload).context("Error
+                // extracting data")?; let mut decoder =
+                // LzmaReader::new_decompressor(data)
+                //     .context("Unable to initialize lzma decoder")?;
+                // Self::run_op_replace(&mut decoder, &mut dst_extents,
+                // block_size)     .context("Error in REPLACE_XZ
+                // operation")
             }
             Some(Type::Zero) => Ok(()), // This is a no-op since the partition is already zeroed
             Some(op) => bail!("Unimplemented operation: {op:?}"),

rust/src/core/mod.rs

@@ -21,9 +21,8 @@ use anyhow::{bail, ensure, Context as _, Error, Result};
 use bzip2::read::BzDecoder;
 use chromeos_update_engine::install_operation::Type;
 use chromeos_update_engine::{DeltaArchiveManifest, InstallOperation, PartitionUpdate};
-use clap::Parser;
 pub use extract::ExtractOptions;
-use lzma::LzmaReader;
+use liblzma::read::XzDecoder;
 use memmap2::{Mmap, MmapMut};
 use payload::Payload;
 use prost::Message as _;
@@ -155,7 +154,7 @@ impl<'a> ExtractOptions2<'a> {
                     partition: SyncUnsafeCell::new(partition),
                     total_ops,
                     total_ops_completed: &total_ops_completed,
-                    progress_reporter: &*self.progress_reporter,
+                    progress_reporter: self.progress_reporter,
                     error: &error,
                 };
                 scope.spawn_broadcast(move |_, ctx| {
@@ -342,8 +341,7 @@ impl Task<'_> {
             }
             Some(Type::ReplaceXz) => {
                 let data = self.extract_data(op).context("Error extracting data")?;
-                let mut decoder = LzmaReader::new_decompressor(data)
-                    .context("Unable to initialize lzma decoder")?;
+                let mut decoder = XzDecoder::new(data);
                 self.run_op_replace(&mut decoder, &mut dst_extents)
                     .context("Error in REPLACE_XZ operation")
             }