From de23b593fea2583f7fae028cd4db0aa8b187d44b Mon Sep 17 00:00:00 2001 From: "Hatter Jiang@Pixelbook" Date: Sun, 2 Aug 2020 12:08:07 +0800 Subject: [PATCH] style: use rust_util s macros --- src/jdk.rs | 19 ++++++------------- src/local_util.rs | 5 ++--- src/tool.rs | 29 +++++++++++------------------ 3 files changed, 19 insertions(+), 34 deletions(-) diff --git a/src/jdk.rs b/src/jdk.rs index 6dcaa2c..3ae95f1 100644 --- a/src/jdk.rs +++ b/src/jdk.rs @@ -6,14 +6,7 @@ use std::{ path::Path, process::Command, }; -use rust_util::{ - iff, - util_os::*, - util_msg::{ - print_error, - print_debug, - }, -}; +use rust_util::util_os::*; use super::{ local_util, tool, @@ -67,7 +60,7 @@ pub fn get_cloud_java(version: &str) -> bool { return true; } } - print_error(&format!("Get java failed, version: {}", version)); + failure!("Get java failed, version: {}", version); false } @@ -78,7 +71,7 @@ pub fn get_macos_java_home(version: &str) -> Option { let output = Command::new(MACOS_LIBEXEC_JAVAHOME).arg("-version").arg(version).output().ok()?; let output_in_utf8 = str::from_utf8(&output.stderr).ok()?; if *VERBOSE { - print_debug(&format!("java_home outputs: {}", output_in_utf8)); + debugging!("java_home outputs: {}", output_in_utf8); } if output_in_utf8.contains("Unable to find any JVMs") { None @@ -94,7 +87,7 @@ pub fn get_local_java_home(version: &str) -> Option { if let Ok(dir_entry) = path { if let Some(p)= dir_entry.path().to_str() { if *VERBOSE { - print_debug(&format!("Try match path: {}", p)); + debugging!("Try match path: {}", p); } let mut path_name = p; if p.ends_with('/') { @@ -111,7 +104,7 @@ pub fn get_local_java_home(version: &str) -> Option { }; if let Some(matched_path) = matched_path_opt { if *VERBOSE { - print_debug(&format!("Matched JDK path found: {}", matched_path)); + debugging!("Matched JDK path found: {}", matched_path); } return if local_util::is_path_exists(matched_path, "Contents/Home") { Some(format!("{}/{}", matched_path, "Contents/Home")) @@ -128,7 +121,7 @@ pub fn get_local_java_home(version: &str) -> Option { pub fn extract_jdk_and_wait(file_name: &str) { if let Ok(local_java_home_base_dir) = local_util::get_user_home_dir(LOCAL_JAVA_HOME_BASE_DIR) { local_util::extract_package_and_wait(&local_java_home_base_dir, file_name).unwrap_or_else(|err| { - print_error(&format!("Extract file: {}, failed: {}", file_name, err)); + failure!("Extract file: {}, failed: {}", file_name, err); }); } } diff --git a/src/local_util.rs b/src/local_util.rs index 4c9bd83..f06e5ea 100644 --- a/src/local_util.rs +++ b/src/local_util.rs @@ -10,7 +10,6 @@ use std::{ use rust_util::{ XResult, new_box_ioerror, - util_msg::print_error, util_io::*, }; @@ -51,7 +50,7 @@ pub fn verify_file_integrity(integrity: &str, file_name: &str) -> XResult }; let integrity_verify_result = digest_hex == calc_digest_hex.as_str(); if ! integrity_verify_result { - print_error(&format!("Verify integrity failed, expected: {}, actual: {}", digest_hex, calc_digest_hex)); + failure!("Verify integrity failed, expected: {}, actual: {}", digest_hex, calc_digest_hex); } Ok(integrity_verify_result) }, @@ -131,7 +130,7 @@ pub fn init_home_dir(home_sub_dir: &str) { pub fn init_dir(dir: &str) { if ! Path::new(dir).exists() { fs::create_dir_all(dir).unwrap_or_else(|err| { - print_error(&format!("Init dir {} failed: {}", dir, err)); + failure!("Init dir {} failed: {}", dir, err); }); } } diff --git a/src/tool.rs b/src/tool.rs index 66b6fdf..471e6b8 100644 --- a/src/tool.rs +++ b/src/tool.rs @@ -6,13 +6,6 @@ use rust_util::{ XResult, new_box_ioerror, util_os::is_macos_or_linux, - util_msg::{ - print_ok, - print_info, - print_warn, - print_error, - print_debug, - }, }; use super::{ http::{ download_url, get_url_content, }, @@ -68,7 +61,7 @@ pub fn get_builder_home(builder: &str, version: &str) -> Option { "maven" => BuilderName::Maven, "gradle" => BuilderName::Gradle, _ => { - print_error(&format!("Unknown builder: {}", builder)); + failure!("Unknown builder: {}", builder); return None; }, }; @@ -90,7 +83,7 @@ pub fn get_cloud_builder(builder: &str, version: &str) -> bool { }; match get_and_extract_tool_package(&local_builder_home_base_dir, true, builder, version, true) { Ok(_) => true, Err(err) => { - print_error(&format!("Get builder: {} failed, version: {}, error: {}", builder, version, err)); + failure!("Get builder: {} failed, version: {}, error: {}", builder, version, err); false }, } @@ -99,7 +92,7 @@ pub fn get_cloud_builder(builder: &str, version: &str) -> bool { pub fn get_local_builder_home_sub(builder_name: BuilderName, local_builder_home_dir: &str) -> Option { match get_local_builder_home_sub_first_sub_dir(local_builder_home_dir) { None => { - print_error(&format!("Cannot find builder home in: {}", local_builder_home_dir)); + failure!("Cannot find builder home in: {}", local_builder_home_dir); None }, Some(p) => Some(BuilderDesc{name: builder_name, home: p, bin: None}), @@ -121,7 +114,7 @@ pub fn get_local_builder_home_sub_first_sub_dir(local_builder_home_dir: &str) -> pub fn get_tool_package_secret() -> XResult { if (*AUTH_TOKEN).is_some() { if *VERBOSE { - print_debug("Use auth token from env 'BUILDJ_AUTH_TOKEN'"); + debugging!("Use auth token from env 'BUILDJ_AUTH_TOKEN'"); } return Ok((*AUTH_TOKEN).as_ref().unwrap().clone()); } @@ -175,12 +168,12 @@ pub fn set_tool_package_secret(secret: &str) -> XResult<()> { pub fn get_tool_package_detail(name: &str, version: &str) -> XResult { let secret: Option = if *NOAUTH { - print_warn("Running in no auth mode!"); + warning!("Running in no auth mode!"); None } else { match get_tool_package_secret() { Ok(r) => Some(r), Err(err) => { - print_warn(&format!("Get package detail secret failed: {}, from file: ~/{}", err, STANDARD_CONFIG_JSON)); + warning!("Get package detail secret failed: {}, from file: ~/{}", err, STANDARD_CONFIG_JSON); None }, } @@ -210,7 +203,7 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: & let tool_package_detail = get_tool_package_detail(name, version)?; let build_json_object = json::parse(&tool_package_detail)?; if *VERBOSE { - print_debug(&format!("Get tool {}:{}, result JSON: {}", name, version, json::stringify_pretty(build_json_object.clone(), 4))); + debugging!("Get tool {}:{}, result JSON: {}", name, version, json::stringify_pretty(build_json_object.clone(), 4)); } if build_json_object["status"] != 200 { return Err(new_box_ioerror(&format!("Error in get tool package detail: {}", build_json_object["message"]))); @@ -238,17 +231,17 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: & init_dir(&target_base_dir); let target_file_name = format!("{}/{}", &target_base_dir, name.to_string()); - print_info(&format!("Start download: {} -> {}", &url.to_string(), &target_file_name)); + information!("Start download: {} -> {}", &url.to_string(), &target_file_name); download_url(&url.to_string(), &mut File::create(&target_file_name)?)?; - print_info(&format!("Start verify integrity: {} ...", &target_file_name)); + information!("Start verify integrity: {} ...", &target_file_name); if local_util::verify_file_integrity(&integrity.to_string(), &target_file_name)? { - print_ok("Verify integrity success."); + success!("Verify integrity success."); } else { return Err(new_box_ioerror("Verify integrity failed!")); } - print_info(&format!("Start extract file: {}", &target_file_name)); + success!("Start extract file: {}", &target_file_name); local_util::extract_package_and_wait(&target_base_dir, &name.to_string())?; Ok(true)