🔀 Merge develop into main (pull request #9)

Release 1.1.2

# External changes
- Check if an app if installed before trying to uninstall it (#3).

# Internal changes
- Move (un)installation methods to `Device`.

Author: matheusamazonas

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "batch_apk_installer"
 description = "A command-line tool for batch installation of Android Packages (APKs)."
-version = "1.1.1"
+version = "1.1.2"
 edition = "2024"
 license = "MIT"
 authors = ["Matheus Amazonas"]

Cargo.toml

@@ -1,5 +1,7 @@
 use crate::config::Platform;
 use crate::error::Error;
+use crate::installation::CommandOutcome;
+use crate::package::Package;
 use regex::Regex;
 use std::fmt::Display;
 use std::process::Command;
@@ -11,16 +13,66 @@ pub struct Device {
 }
 
 impl Device {
-	pub fn name(&self) -> &str {
-		&self.name
+	pub fn supports(&self, package: &Package) -> bool {
+		package
+			.platforms()
+			.iter()
+			.any(|p| match package.match_file_name() {
+				false => &self.platform == p,
+				true => package.file_name().to_lowercase().contains(&self.platform),
+			})
+	}
+
+	pub async fn install(&self, package: &Package) -> CommandOutcome {
+		let path = package.path();
+		let command = tokio::process::Command::new("adb")
+			.args(["-s", &self.id, "install", path])
+			.output();
+		let description = format!("Installation of {} on {}", package.id(), self.name);
+		match command.await {
+			Ok(output) if output.status.success() => CommandOutcome::from_success(&description),
+			Ok(output) => {
+				let error = Error::from_installation_error(&output.stderr);
+				CommandOutcome::from_error(&description, error)
+			}
+			Err(e) => CommandOutcome::from_error(&description, Error::Installation(e.to_string())),
+		}
 	}
 
-	pub fn id(&self) -> &str {
-		&self.id
+	pub async fn uninstall(&self, package: &Package) -> CommandOutcome {
+		let description = format!("Uninstallation of {} on {}", package.id(), self.name);
+		let command = tokio::process::Command::new("adb")
+			.args(["-s", &self.id, "uninstall", package.id()])
+			.output();
+		match command.await {
+			Ok(output) if output.status.success() => CommandOutcome::from_success(&description),
+			Ok(output) => {
+				let message = String::from_utf8_lossy(&output.stdout);
+				let error = Error::Uninstall(message.to_string());
+				CommandOutcome::from_error(&description, error)
+			}
+			Err(e) => {
+				let error = Error::Uninstall(e.to_string());
+				CommandOutcome::from_error(&description, error)
+			}
+		}
 	}
 
-	pub fn platform(&self) -> &String {
-		&self.platform
+	pub async fn has_app_installed(&self, app_name: &str) -> Result<bool, Error> {
+		let output = tokio::process::Command::new("adb")
+			.args([
+				"-s",
+				&self.id,
+				"shell",
+				"pm list packages",
+				"| grep",
+				app_name,
+			])
+			.output();
+		match output.await {
+			Ok(output) => Ok(output.status.success()),
+			Err(e) => Err(Error::Uninstall(e.to_string())),
+		}
 	}
 
 	fn from_str_with_platforms(line: &str, platforms: &[Platform]) -> Option<Device> {

src/device.rs

@@ -24,6 +24,19 @@ pub enum Error {
 	Uninstall(String),
 }
 
+impl Error {
+	pub fn from_installation_error(error: &[u8]) -> Error {
+		let error = String::from_utf8_lossy(error);
+		if error.contains("INSTALL_FAILED_UPDATE_INCOMPATIBLE") {
+			Error::PackageSignatureMismatch
+		} else if error.contains("INSTALL_FAILED_VERSION_DOWNGRADE") {
+			Error::PackageDowngrade
+		} else {
+			Error::Installation(String::from(error))
+		}
+	}
+}
+
 impl Display for Error {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
 		match self {

src/error.rs

@@ -1,6 +1,5 @@
 use crate::device::Device;
 use crate::error::Error;
-use crate::error::Error::Uninstall;
 use crate::package::Package;
 use std::sync::Arc;
 use tokio::sync::mpsc;
@@ -19,6 +18,20 @@ impl CommandOutcome {
 	pub fn error(&self) -> Option<&Error> {
 		self.error.as_ref()
 	}
+
+	pub fn from_success(description: &str) -> CommandOutcome {
+		CommandOutcome {
+			description: String::from(description),
+			error: None,
+		}
+	}
+
+	pub fn from_error(description: &str, error: Error) -> CommandOutcome {
+		CommandOutcome {
+			description: String::from(description),
+			error: Some(error),
+		}
+	}
 }
 
 pub struct DeviceInstallations {
@@ -33,10 +46,7 @@ impl DeviceInstallations {
 	) -> Vec<DeviceInstallations> {
 		let mut requests: Vec<DeviceInstallations> = Vec::new();
 		for device in devices {
-			let matches: Vec<_> = packages
-				.iter()
-				.filter(|p| is_package_match(device, p))
-				.collect();
+			let matches: Vec<_> = packages.iter().filter(|p| device.supports(p)).collect();
 			if matches.is_empty() {
 				continue;
 			}
@@ -66,86 +76,33 @@ impl DeviceInstallations {
 			let tx = tx.clone();
 			tokio::task::spawn(async move {
 				if self.uninstall_first {
-					let uninstall_outcome = perform_uninstall(&device, &package).await;
-					tx.send(uninstall_outcome)
-						.await
-						.expect("Error sending operation outcome.");
+					match device.has_app_installed(package.id()).await {
+						Ok(true) => {
+							// App is installed, uninstall it first.
+							let uninstall_outcome = device.uninstall(&package).await;
+							tx.send(uninstall_outcome)
+								.await
+								.expect("Error sending uninstallation outcome.");
+						}
+						Ok(false) => (), // Do nothing because the app is not installed.
+						Err(e) => {
+							let error = CommandOutcome::from_error("Uninstall check failed", e);
+							tx.send(error)
+								.await
+								.expect("Error sending uninstallation check error.");
+						}
+					}
 				}
-				let install_outcome = perform_install(&device, &package).await;
+				let install_outcome = device.install(&package).await;
 				tx.send(install_outcome)
 					.await
-					.expect("Error sending operation outcome.");
+					.expect("Error sending installation outcome.");
 			});
 		}
 		ReceiverStream::new(rx)
 	}
 }
 
-fn is_package_match(device: &Device, package: &Package) -> bool {
-	package
-		.platforms()
-		.iter()
-		.any(|p| match package.match_file_name() {
-			false => device.platform() == p,
-			true => package
-				.file_name()
-				.to_lowercase()
-				.contains(device.platform()),
-		})
-}
-
-fn parse_installation_error(error: &[u8]) -> Error {
-	let error = String::from_utf8_lossy(error);
-	if error.contains("INSTALL_FAILED_UPDATE_INCOMPATIBLE") {
-		Error::PackageSignatureMismatch
-	} else if error.contains("INSTALL_FAILED_VERSION_DOWNGRADE") {
-		Error::PackageDowngrade
-	} else {
-		Error::Installation(String::from(error))
-	}
-}
-
-async fn perform_uninstall(device: &Device, package: &Package) -> CommandOutcome {
-	let description = format!("Uninstallation of {} on {}", package.id(), device.name());
-	let output = tokio::process::Command::new("adb")
-		.args(["-s", device.id(), "uninstall", package.id()])
-		.output();
-	match output.await {
-		Ok(output) if output.status.success() => CommandOutcome {
-			description,
-			error: None,
-		},
-		Ok(output) => {
-			let message = String::from_utf8_lossy(&output.stderr);
-			CommandOutcome {
-				description,
-				error: Some(Uninstall(message.to_string())),
-			}
-		}
-		Err(e) => CommandOutcome {
-			description,
-			error: Some(Uninstall(e.to_string())),
-		},
-	}
-}
-
-async fn perform_install(device: &Device, package: &Package) -> CommandOutcome {
-	let path = package.path();
-	let output = tokio::process::Command::new("adb")
-		.args(["-s", device.id(), "install", path])
-		.output();
-	let error = match output.await {
-		Ok(output) if output.stderr.is_empty() => None, // Success
-		Ok(output) => {
-			let error = parse_installation_error(&output.stderr);
-			Some(error)
-		}
-		Err(e) => Some(Error::Installation(e.to_string())),
-	};
-	let description = format!("Installation of {} on {}", package.id(), device.name());
-	CommandOutcome { description, error }
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -156,7 +113,7 @@ mod tests {
 		[INSTALL_FAILED_UPDATE_INCOMPATIBLE: Package com.lazysquirrellabs.airhockey signatures \
 		do not match previously installed version; ignoring!]";
 		assert_eq!(
-			parse_installation_error(error.as_bytes()),
+			Error::from_installation_error(error.as_bytes()),
 			Error::PackageSignatureMismatch
 		);
 	}
@@ -166,7 +123,7 @@ mod tests {
 		let error = "adb: failed to install 5.1/CorpusVR-5.1-5010001-Dashboard.apk: \
 		Failure [INSTALL_FAILED_VERSION_DOWNGRADE]";
 		assert_eq!(
-			parse_installation_error(error.as_bytes()),
+			Error::from_installation_error(error.as_bytes()),
 			Error::PackageDowngrade
 		);
 	}
@@ -176,7 +133,7 @@ mod tests {
 		// Sometimes ADB throws errors without no content, just a header, like the one below.
 		let error = "adb: failed to install 5.1/CorpusVR-5.1-5010001-Dashboard.apk:\n";
 		assert_eq!(
-			parse_installation_error(error.as_bytes()),
+			Error::from_installation_error(error.as_bytes()),
 			Error::Installation(String::from(error))
 		);
 	}