diff --git a/Cargo.lock b/Cargo.lock index 28a6479..5d39847 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -72,7 +72,7 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", - "rust_util 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)", + "rust_util 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", "term 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "urlencoding 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1015,7 +1015,7 @@ dependencies = [ [[package]] name = "rust_util" -version = "0.6.14" +version = "0.6.15" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1619,7 +1619,7 @@ dependencies = [ "checksum reqwest 0.9.22 (registry+https://github.com/rust-lang/crates.io-index)" = "2c2064233e442ce85c77231ebd67d9eca395207dec2127fe0bbedde4bd29a650" "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" -"checksum rust_util 0.6.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7222f977acb4264fb55f1aa7cf11e09c735fe961b369aef92eea670949628498" +"checksum rust_util 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)" = "754278eaff41b86ced9e2913b3f5ee8bd7c2446be81f0739a567e9d0ad6cdb3a" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" diff --git a/Cargo.toml b/Cargo.toml index 2ba0e61..63b30a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,4 +12,4 @@ urlencoding = "1.1.1" dirs = "3.0.1" rust-crypto = "0.2.36" lazy_static = "1.4.0" -rust_util = "0.6.14" +rust_util = "0.6.15" diff --git a/src/http.rs b/src/http.rs index a63ef2d..5ed1367 100644 --- a/src/http.rs +++ b/src/http.rs @@ -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(()) } diff --git a/src/local_util.rs b/src/local_util.rs index 559e173..27ef20a 100644 --- a/src/local_util.rs +++ b/src/local_util.rs @@ -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); } }