chore: add dependency to maestro-utils

client/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.87"
 common = { path = "../common" }
-tokio = { version = "1.40.0", features = ["macros", "rt", "rt-multi-thread"] }
+tokio = { version = "1.41.1", features = ["macros", "rt", "rt-multi-thread"] }
+utils = { git = "https://github.com/maestro-os/maestro-utils" }
 
 [features]
 default = []

client/src/install.rs

@@ -1,8 +1,8 @@
 //! This module handles package installation.
 
 use crate::confirm;
-use anyhow::bail;
-use anyhow::Result;
+use common::anyhow::bail;
+use common::anyhow::Result;
 use common::package::Package;
 use common::repository;
 use common::repository::Repository;
@@ -123,9 +123,7 @@ pub async fn install(
 			}
 		}
 
-		print!("Total download size: ");
-		common::util::print_size(total_size);
-		println!();
+		println!("Total download size: {}", ByteSize(total_size));
 	}
 	#[cfg(not(feature = "network"))]
 	{

client/src/main.rs

@@ -7,8 +7,8 @@ mod remove;
 #[cfg(feature = "network")]
 mod update;
 
-use anyhow::anyhow;
-use anyhow::Result;
+use common::anyhow::anyhow;
+use common::anyhow::Result;
 use common::Environment;
 use install::install;
 use remove::remove;

client/src/remove.rs

@@ -1,8 +1,7 @@
 //! TODO doc
 
-use anyhow::anyhow;
-use anyhow::bail;
-use anyhow::Result;
+use common::anyhow::Result;
+use common::anyhow::{anyhow, bail};
 use common::package;
 use common::Environment;
 

common/src/lib.rs

@@ -8,6 +8,8 @@ pub mod repository;
 pub mod util;
 pub mod version;
 
+pub use anyhow;
+
 #[cfg(feature = "network")]
 pub mod download;
 

common/src/util.rs

@@ -113,30 +113,6 @@ pub fn recursive_copy(src: &Path, dst: &Path) -> io::Result<()> {
 	Ok(())
 }
 
-// TODO delete (reuse the version in maestro-utils)
-/// Prints the given size in bytes into a human-readable form.
-pub fn print_size(mut size: u64) {
-	let mut level = 0;
-	while level < 6 && size > 1024 {
-		size /= 1024;
-		level += 1;
-	}
-
-	let suffix = match level {
-		0 => "bytes",
-		1 => "KiB",
-		2 => "MiB",
-		3 => "GiB",
-		4 => "TiB",
-		5 => "PiB",
-		6 => "EiB",
-
-		_ => return,
-	};
-
-	print!("{size} {suffix}");
-}
-
 // TODO: rework to allow deserialize from structs with lifetimes (currently unefficient)
 /// Reads a JSON file.
 pub fn read_json<T: for<'a> Deserialize<'a>>(file: &Path) -> io::Result<T> {