hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2025-12-29 18:30:05 +08:00
Code Issues Releases Wiki Activity

style: use rust_util s macros

Browse Source
This commit is contained in:
Hatter Jiang
2020-08-02 12:01:51 +08:00
parent 7d5b2b4294
commit ddf1c54d5d
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/http.rs
View File

@@ -3,17 +3,13 @@ use std::fs::File;
use rust_util::{ use rust_util::{
XResult, XResult,
util_io::copy_io, util_io::copy_io,
util_msg::{
print_debug,
print_warn,
},
}; };
use super::misc::VERBOSE; 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_debug(&format!("Start download URL: {}", url)); debugging!("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 +17,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_warn(&format!("Get content length for {:?}, error: {}", len_value, err)); warning!("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_warn(&format!("Get content length for {:?}, error: {}", len_value, err)); warning!("Get content length for {:?}, error: {}", len_value, err);
-1 -1
} }
} }
}, },
}; };
if *VERBOSE { if *VERBOSE {
print_debug(&format!("Content-Length: {}", header_content_length)); warning!("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 +38,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_debug(&format!("Get URL: {}", url)); warning!("Get URL: {}", url);
} }
Ok(reqwest::get(url)?.text()?) Ok(reqwest::get(url)?.text()?)
} }