refactor: cleanup archive decompression

builder/src/build.rs

@@ -114,15 +114,13 @@ impl BuildProcess {
 	/// `output_path` is the path at which the package's archive will be created.
 	pub fn create_archive(&self, output_path: &Path) -> io::Result<()> {
 		let build_desc_path = self.input_path.join("package.json");
-
 		let tar_gz = File::create(output_path)?;
 		let enc = GzEncoder::new(tar_gz, Compression::default());
 		let mut tar = tar::Builder::new(enc);
 		tar.follow_symlinks(false);
 		tar.append_path_with_name(build_desc_path, "package.json")?;
 		tar.append_dir_all("data", &self.sysroot)?;
 		// TODO add install/update/remove hooks
-
 		tar.finish()
 	}
 

builder/src/desc.rs

@@ -61,7 +61,7 @@ pub struct Source {
 }
 
 impl Source {
-	/// Fetches files from the source and uncompresses them if necessary.
+	/// Fetches files from the source and decompress them if necessary.
 	///
 	/// Files are placed into the build directory `build_dir` according to the specified location.
 	pub async fn fetch(&self, build_dir: &Path) -> Result<()> {
@@ -75,9 +75,8 @@ impl Source {
 				if metadata.is_dir() {
 					common::util::recursive_copy(path, &dest_path)?;
 				} else {
-					// TODO uncompress only if it is an actual archive
-					// Uncompress tarball
-					common::util::uncompress(path, &dest_path, self.unwrap)?;
+					// TODO decompress only if it is an actual archive
+					common::util::decompress(path, &dest_path, self.unwrap)?;
 				}
 			}
 
@@ -97,12 +96,8 @@ impl Source {
 				let mut download_task = DownloadTask::new(url, &path).await?;
 				// TODO progress bar
 				while download_task.next().await? {}
-
 				// TODO check integrity with hash if specified
-
-				// Uncompress the archive
-				common::util::uncompress(&path, &dest_path, self.unwrap)?;
-
+				common::util::decompress(&path, &dest_path, self.unwrap)?;
 				// TODO remove archive?
 			}
 

builder/src/main.rs

@@ -6,8 +6,8 @@ mod util;
 
 use crate::build::BuildProcess;
 use crate::util::{get_build_triplet, get_jobs_count};
-use anyhow::{anyhow, bail};
 use anyhow::Result;
+use anyhow::{anyhow, bail};
 use common::repository::Repository;
 use std::env;
 use std::fs;

common/Cargo.toml

@@ -13,6 +13,7 @@ bzip2 = "0.4.4"
 flate2 = "1.0.30"
 futures = "0.3.30"
 futures-util = "0.3.30"
+infer = "0.15.0"
 reqwest = { version = "0.12.4", features = ["blocking", "json", "stream"], optional = true }
 serde = { version = "1.0.199", features = ["derive"] }
 serde_json = "1.0.116"