1
0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-30 02:40:03 +08:00

ref print_*

This commit is contained in:
2020-05-02 18:42:28 +08:00
parent 0e51d888d8
commit 10108b5b58

View File

@@ -4,8 +4,8 @@ use rust_util::{
XResult, XResult,
util_io::copy_io, util_io::copy_io,
util_msg::{ util_msg::{
print_message, print_debug,
MessageType, print_warn,
}, },
}; };
@@ -13,7 +13,7 @@ use super::misc::VERBOSE;
pub fn download_url(url: &str, dest: &mut File) -> XResult<()> { pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
if *VERBOSE { if *VERBOSE {
print_message(MessageType::DEBUG, &format!("Start download URL: {}", url)); print_debug(&format!("Start download URL: {}", url));
} }
let mut response = reqwest::get(url)?; let mut response = reqwest::get(url)?;
let header_content_length: i64 = match response.headers().get("content-length") { let header_content_length: i64 = match response.headers().get("content-length") {
@@ -21,20 +21,20 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
Some(len_value) => { Some(len_value) => {
let len_str = match len_value.to_str() { let len_str = match len_value.to_str() {
Ok(len_str) => len_str, Err(err) => { Ok(len_str) => len_str, Err(err) => {
print_message(MessageType::WARN, &format!("Get content length for {:?}, error: {}", len_value, err)); print_warn(&format!("Get content length for {:?}, error: {}", len_value, err));
"-1" "-1"
}, },
}; };
match len_str.parse::<i64>() { match len_str.parse::<i64>() {
Ok(len) => len, Err(err) => { Ok(len) => len, Err(err) => {
print_message(MessageType::WARN, &format!("Get content length for {:?}, error: {}", len_value, err)); print_warn(&format!("Get content length for {:?}, error: {}", len_value, err));
-1 -1
} }
} }
}, },
}; };
if *VERBOSE { if *VERBOSE {
print_message(MessageType::DEBUG, &format!("Content-Length: {}", header_content_length)); print_debug(&format!("Content-Length: {}", header_content_length));
} }
copy_io(&mut response, dest, header_content_length)?; copy_io(&mut response, dest, header_content_length)?;
Ok(()) Ok(())
@@ -42,7 +42,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
pub fn get_url_content(url: &str) -> XResult<String> { pub fn get_url_content(url: &str) -> XResult<String> {
if *VERBOSE { if *VERBOSE {
print_message(MessageType::DEBUG, &format!("Get URL: {}", url)); print_debug(&format!("Get URL: {}", url));
} }
Ok(reqwest::get(url)?.text()?) Ok(reqwest::get(url)?.text()?)
} }