Alter sdk default path return and bump version

Author: enfipy

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "android-tools"
-version = "0.2.10"
+version = "0.2.11"
 edition = "2021"
 authors = ["DodoRare Team <[email protected]>"]
 description = "Android-related tools for building and developing applications 🛠"
@@ -14,14 +14,14 @@ thiserror = "1.0"
 displaydoc = "0.2"
 walkdir = "2.3"
 dirs = { version = "4.0.0", optional = true }
-which = { version = "4.2.2", optional = true }
+which = { version = "4.2.5", optional = true }
 
 [dev-dependencies]
-tempfile = "3.2"
+tempfile = "3.3"
 dunce = "1.0"
 zip = "0.5.13"
 fs_extra = "1.2"
-zip-extensions = "0.6"
+zip-extensions = "0.6.1"
 
 [features]
 default = ["aapt2", "bundletool", "java-tools", "emulator"]

src/aapt2/link.rs

@@ -609,7 +609,7 @@ impl Aapt2Link {
             });
         } else if let Some(compiled_res) = &self.compiled_res {
             let paths = std::fs::read_dir(compiled_res)
-                .map_err(|_| Error::CompiledResourcesIsNotFound)?
+                .map_err(|_| Error::CompiledResourcesNotFound)?
                 .flat_map(|e| e.map(|x| x.path()))
                 .collect::<Vec<_>>();
             paths.iter().for_each(|input| {

src/bundletool/mod.rs

@@ -93,12 +93,12 @@ pub fn bundletool() -> Result<Command> {
             std::env::var("BUNDLETOOL_VERSION").unwrap_or_else(|_| BUNDLETOOL_VERSION.to_string());
         let bundletool_file = format!("bundletool-all-{}.jar", env_version);
         let bundletool_file_path = dirs::home_dir()
-            .ok_or_else(|| Error::PathIsNotFound(PathBuf::from("$HOME")))?
+            .ok_or(Error::UnableToAccessHomeDirectory)?
             .join(bundletool_file);
         if bundletool_file_path.exists() {
             bundletool_init.arg(bundletool_file_path);
         } else {
-            return Err(Error::BundletoolIsNotFound);
+            return Err(Error::BundletoolNotFound);
         }
     }
     Ok(bundletool_init)

src/error.rs

@@ -9,21 +9,21 @@ pub type Result<T> = std::result::Result<T, Error>;
 #[derive(Display, Debug, Error)]
 pub enum Error {
     /// Android SDK or Android NDK is not found. Check the installation path or use crossbundle install command to install it
-    AndroidToolIsNotFound,
+    AndroidToolNotFound,
     /// Android SDK is not found. Check the installation path or use crossbundle install command to install it
-    AndroidSdkIsNotFound,
+    AndroidSdkNotFound,
     /// Bundletool is not found. Check the installation path or use crossbundle install command to install it
-    BundletoolIsNotFound,
+    BundletoolNotFound,
     /// Unable to access to home directory or home directory doesn't exists
-    HomeDirectoryUnableToAccess,
+    UnableToAccessHomeDirectory,
     /// Path {0:?} doesn't exists
-    PathIsNotFound(PathBuf),
+    PathNotFound(PathBuf),
     /// Command {0} is not found
-    CmdIsNotFound(String),
+    CmdNotFound(String),
     /// Command had a non-zero exit code. Stdout: {0} Stderr: {1}
     CmdFailed(String, String),
     /// Compiled resources is not found
-    CompiledResourcesIsNotFound,
+    CompiledResourcesNotFound,
     /// IO error
     Io(#[from] std::io::Error),
 }

src/java_tools/jarsigner.rs

@@ -484,5 +484,5 @@ fn jarsigner_tool() -> Result<Command> {
             return Ok(Command::new(keytool));
         }
     }
-    Err(Error::CmdIsNotFound("jarsigner".to_string()))
+    Err(Error::CmdNotFound("jarsigner".to_string()))
 }

src/java_tools/keytool.rs

@@ -948,7 +948,7 @@ pub fn keytool() -> Result<Command> {
             return Ok(Command::new(keytool));
         }
     }
-    Err(Error::CmdIsNotFound("keytool".to_string()))
+    Err(Error::CmdNotFound("keytool".to_string()))
 }
 
 #[derive(Clone)]
@@ -1046,7 +1046,7 @@ impl Key {
 /// Returns or crates it if needed the path to `.android` in the user's home directory.
 pub fn android_dir() -> Result<PathBuf> {
     let android_dir = dirs::home_dir()
-        .ok_or_else(|| Error::PathIsNotFound(PathBuf::from("$HOME")))?
+        .ok_or(Error::UnableToAccessHomeDirectory)?
         .join(".android");
     std::fs::create_dir_all(&android_dir)?;
     Ok(android_dir)

src/lib.rs

@@ -32,16 +32,21 @@ pub fn sdk_path_from_env() -> crate::error::Result<PathBuf> {
             .ok()
             .or_else(|| std::env::var("ANDROID_SDK_PATH").ok())
             .or_else(|| std::env::var("ANDROID_HOME").ok());
-        std::path::PathBuf::from(
-            sdk_path.unwrap_or(sdk_install_path()?.to_str().unwrap().to_string()),
-        )
+        if let Some(path) = sdk_path {
+            std::path::PathBuf::from(path)
+        } else {
+            sdk_install_path()?
+        }
     };
+    if !sdk_path.exists() {
+        return Err(Error::AndroidSdkNotFound)?;
+    }
     Ok(sdk_path)
 }
 
 /// Default installation path
 pub fn sdk_install_path() -> crate::error::Result<PathBuf> {
-    let home_dir_path = dirs::home_dir().ok_or(Error::HomeDirectoryUnableToAccess)?;
+    let home_dir_path = dirs::home_dir().ok_or(Error::UnableToAccessHomeDirectory)?;
     #[cfg(target_os = "windows")]
     let path = std::path::Path::new("Local").join("Android").join("Sdk");
     #[cfg(target_os = "macos")]
@@ -57,9 +62,6 @@ pub fn sdk_install_path() -> crate::error::Result<PathBuf> {
     #[cfg(not(target_os = "windows"))]
     let sdk_path = home_dir_path.join(path);
 
-    if !sdk_path.exists() {
-        return Err(Error::AndroidSdkIsNotFound)?;
-    }
     Ok(sdk_path)
 }
 
@@ -70,6 +72,6 @@ pub fn find_max_version(target_dir: &std::path::Path) -> crate::error::Result<St
         .filter_map(|path| path.file_name().into_string().ok())
         .filter(|name| name.chars().next().unwrap().is_ascii_digit())
         .max()
-        .ok_or(Error::AndroidToolIsNotFound)?;
+        .ok_or(Error::AndroidToolNotFound)?;
     Ok(max_version)
 }