From 0f49ec8a9bca1543e0b0e4af58b73efa99279357 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sat, 2 May 2020 18:35:41 +0800
Subject: [PATCH] ref fn

---
 src/build_json.rs | 7 ++++---
 src/http.rs       | 2 +-
 src/tool.rs       | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/build_json.rs b/src/build_json.rs
index 96cd5d2..fcade9f 100644
--- a/src/build_json.rs
+++ b/src/build_json.rs
@@ -10,7 +10,7 @@ use rust_util::{
     }
 };
 
-use super::http::get_url;
+use super::http::get_url_content;
 use super::misc::VERBOSE;
 
 pub const BUILD_JSON: &str = "build.json";
@@ -21,12 +21,13 @@ pub fn get_archive_version(gid: &str, aid: &str) -> XResult<String> {
     if *VERBOSE {
         print_message(MessageType::DEBUG, &format!("Start get archive info: {}:{}", gid, aid));
     }
-    let mut url = String::from(GET_ARCHIVER_VERSION_URL);
+    let mut url = String::with_capacity(1024);
+    url.push_str(GET_ARCHIVER_VERSION_URL);
     url.push_str("?gid=");
     url.push_str(&urlencoding::encode(gid));
     url.push_str("&aid=");
     url.push_str(&urlencoding::encode(aid));
-    let version_result = get_url(url.as_str())?;
+    let version_result = get_url_content(url.as_str())?;
     if *VERBOSE {
         print_message(MessageType::DEBUG, &format!("Get archive result: {}", version_result));
     }
diff --git a/src/http.rs b/src/http.rs
index 632afee..c4828bb 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -40,7 +40,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
     Ok(())
 }
 
-pub fn get_url(url: &str) -> XResult<String> {
+pub fn get_url_content(url: &str) -> XResult<String> {
     if *VERBOSE {
         print_message(MessageType::DEBUG, &format!("Get URL: {}", url));
     }
diff --git a/src/tool.rs b/src/tool.rs
index 8f37381..a8e4994 100644
--- a/src/tool.rs
+++ b/src/tool.rs
@@ -12,7 +12,7 @@ use rust_util::{
     },
 };
 use super::{
-    http,
+    http::{ download_url, get_url_content, },
     local_util::{self, *},
     misc::*,
 };
@@ -200,7 +200,7 @@ pub fn get_tool_package_detail(name: &str, version: &str) -> XResult<String> {
     url.push_str(&urlencoding::encode(name));
     url.push_str("&ver=");
     url.push_str(&urlencoding::encode(version));
-    Ok(http::get_url(url.as_str())?)
+    Ok(get_url_content(url.as_str())?)
 }
 
 pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: &str, version: &str, extract_match: bool) -> XResult<bool> {
@@ -236,7 +236,7 @@ pub fn get_and_extract_tool_package(base_dir: &str, dir_with_name: bool, name: &
     let target_file_name = format!("{}/{}", &target_base_dir, name.to_string());
 
     print_message(MessageType::INFO, &format!("Start download: {} -> {}", &url.to_string(), &target_file_name));
-    http::download_url(&url.to_string(), &mut File::create(&target_file_name)?)?;
+    download_url(&url.to_string(), &mut File::create(&target_file_name)?)?;
 
     print_message(MessageType::INFO, &format!("Start verify integrity: {} ...", &target_file_name));
     if local_util::verify_file_integrity(&integrity.to_string(), &target_file_name)? {