From 0245dde9fa912d03171743d09cf54da45fa0c2cb Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Fri, 23 Aug 2019 01:42:00 +0800 Subject: [PATCH] update use of new_box_error --- src/local_util.rs | 14 +++++++------- src/tool.rs | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/local_util.rs b/src/local_util.rs index d2207e9..bc14037 100644 --- a/src/local_util.rs +++ b/src/local_util.rs @@ -8,12 +8,12 @@ use std::{ }; use rust_util::{ - new_box_error, + XResult, + new_box_ioerror, util_msg::{ print_message, MessageType, }, - XResult, util_io::*, }; @@ -42,7 +42,7 @@ pub fn is_buildin_args(args: &Vec) -> bool { pub fn verify_file_integrity(integrity: &str, file_name: &str) -> XResult { match integrity.find('-') { - None => Err(new_box_error(&format!("Not supported integrigty: {}", integrity))), + None => Err(new_box_ioerror(&format!("Not supported integrigty: {}", integrity))), Some(index) => { let digest_hex = &integrity[index+1..]; let calc_digest_hex = match &integrity[0..index] { @@ -50,7 +50,7 @@ pub fn verify_file_integrity(integrity: &str, file_name: &str) -> XResult "sha512:hex" => calc_file_digest(&mut Sha512::new(), "SHA512", file_name)?, "sha1:hex" => calc_file_digest(&mut Sha1::new(), "SHA1", file_name)?, "md5:hex" => calc_file_digest(&mut Md5::new(), "MD5", file_name)?, - _ => return Err(new_box_error(&format!("Not supported integrigty: {}", integrity))), + _ => return Err(new_box_ioerror(&format!("Not supported integrigty: {}", integrity))), }; let integrity_verify_result = digest_hex == calc_digest_hex.as_str(); if ! integrity_verify_result { @@ -92,9 +92,9 @@ pub fn calc_file_digest(digest: &mut Digest, digest_alg: &str, file_name: &str) pub fn get_user_home() -> XResult { match dirs::home_dir() { - None => Err(new_box_error("Home dir not found!")), + None => Err(new_box_ioerror("Home dir not found!")), Some(home_dir_o) => match home_dir_o.to_str() { - None => Err(new_box_error("Home dir not found!")), + None => Err(new_box_ioerror("Home dir not found!")), Some(home_dir_str) => Ok(home_dir_str.to_string()), }, } @@ -122,7 +122,7 @@ pub fn extract_package_and_wait(dir: &str, file_name: &str) -> XResult<()> { cmd = Command::new("tar"); cmd.arg("-xzvf"); } else { - return Err(new_box_error(&format!("Unknown file type: {}", file_name))); + return Err(new_box_ioerror(&format!("Unknown file type: {}", file_name))); } cmd.arg(file_name).current_dir(dir).spawn()?.wait()?; Ok(()) diff --git a/src/tool.rs b/src/tool.rs index b4533e6..bbf4d33 100644 --- a/src/tool.rs +++ b/src/tool.rs @@ -6,13 +6,13 @@ use std::{ use super::{ http, rust_util::{ - new_box_error, + XResult, + new_box_ioerror, util_os::is_macos_or_linux, util_msg::{ print_message, MessageType, }, - XResult, }, local_util::{self, *}, misc::*, @@ -155,7 +155,7 @@ pub fn get_tool_package_secret() -> XResult { let build_js_auth_token = &standard_config_object["build.js"]["auth_token"]; if build_js_auth_token.is_null() { - Err(new_box_error("Standard json#build.js#auth_token is null.")) + Err(new_box_ioerror("Standard json#build.js#auth_token is null.")) } else { Ok(build_js_auth_token.to_string()) } @@ -171,12 +171,12 @@ pub fn set_tool_package_secret(secret: &str) -> XResult<()> { "auth_token" => secret, } }, 4)) { Ok(_) => Ok(()), - Err(err) => Err(new_box_error(&format!("Write config failed: {}, error message: {}", standard_config_file, err))), + Err(err) => Err(new_box_ioerror(&format!("Write config failed: {}, error message: {}", standard_config_file, err))), } }, Ok(f) => { if ! f.is_file() { - return Err(new_box_error(&format!("Config is not a file: {}", standard_config_file))); + return Err(new_box_ioerror(&format!("Config is not a file: {}", standard_config_file))); } let standard_config_json = fs::read_to_string(&standard_config_file)?; let mut standard_config_object = json::parse(&standard_config_json)?; @@ -189,7 +189,7 @@ pub fn set_tool_package_secret(secret: &str) -> XResult<()> { } match fs::write(&standard_config_file, json::stringify_pretty(standard_config_object, 4)) { Ok(_) => Ok(()), - Err(err) => Err(new_box_error(&format!("Write config failed: {}, error message: {}", &standard_config_file, err))), + Err(err) => Err(new_box_ioerror(&format!("Write config failed: {}, error message: {}", &standard_config_file, err))), } } } @@ -237,20 +237,20 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: & print_message(MessageType::DEBUG, &format!("Get tool {}:{}, result JSON: {}", name, version, json::stringify_pretty(build_json_object.clone(), 4))); } if build_json_object["status"] != 200 { - return Err(new_box_error(&format!("Error in get tool package detail: {}", build_json_object["message"]))); + return Err(new_box_ioerror(&format!("Error in get tool package detail: {}", build_json_object["message"]))); } let data = &build_json_object["data"]; let integrity = &data["integrity"]; let url = &data["url"]; let name = &data["name"]; if integrity.is_null() || url.is_null() || name.is_null() { - return Err(new_box_error(&format!("Parse tool package detail failed: {}", tool_package_detail))); + return Err(new_box_ioerror(&format!("Parse tool package detail failed: {}", tool_package_detail))); } let n = data["n"].to_string(); let v = data["v"].to_string(); if extract_match && version != &v { - return Err(new_box_error(&format!("Required version not match, {}: {} vs {}", name, version, &v))); + return Err(new_box_ioerror(&format!("Required version not match, {}: {} vs {}", name, version, &v))); } let mut target_base_dir = String::new(); @@ -269,7 +269,7 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: & if local_util::verify_file_integrity(&integrity.to_string(), &target_file_name)? { print_message(MessageType::OK, "Verify integrity success."); } else { - return Err(new_box_error(&format!("Verify integrity failed!"))); + return Err(new_box_ioerror(&format!("Verify integrity failed!"))); } print_message(MessageType::INFO, &format!("Start extract file: {}", &target_file_name));