hatter/buildj
1
0
Fork 0
mirror of https://github.com/jht5945/buildj.git synced 2026-02-28 18:00:04 +08:00
Code Issues Releases Wiki Activity

feat: use rust_util 0.6.15

Browse Source
This commit is contained in:
Hatter Jiang
2020-09-20 16:59:50 +08:00
parent c214a53219
commit e227603ab2
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/http.rs
View File

@@ -1,5 +1,5 @@
use std::fs::File;
use rust_util::{ XResult, util_io::copy_io };
use rust_util::{ XResult, util_io };
use crate::misc::VERBOSE;
@@ -27,7 +27,7 @@ pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
if *VERBOSE {
debugging!("Content-Length: {}", header_content_length);
}
copy_io(&mut response, dest, header_content_length)?;
util_io::copy_io_default(&mut response, dest, header_content_length)?;
Ok(())
}

6
src/local_util.rs
View File

@@ -4,7 +4,6 @@ use std::{
io::{ Read, ErrorKind },
path::Path,
process::Command,
time::SystemTime,
};
use rust_util::{ XResult, new_box_ioerror, util_io::* };
use crypto::{
@@ -55,7 +54,7 @@ pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &s
let mut buf: [u8; DEFAULT_BUF_SIZE] = [0u8; DEFAULT_BUF_SIZE];
let mut f = File::open(file_name)?;
let file_len = f.metadata().map(|md| md.len() as i64).unwrap_or(-1_i64);
let start = SystemTime::now();
let mut print_status_context = PrintStatusContext::default();
let mut written = 0_i64;
loop {
let len = match f.read(&mut buf) {
@@ -66,8 +65,7 @@ pub fn calc_file_digest(digest: &mut dyn Digest, digest_alg: &str, file_name: &s
};
digest.input(&buf[..len]);
written += len as i64;
let cost = SystemTime::now().duration_since(start).unwrap();
print_status_last_line(&format!("Calc {}", digest_alg), file_len, written, cost);
print_status_last_line(&format!("Calc {}", digest_alg), file_len, written, &mut print_status_context);
}
}