1
0
mirror of https://github.com/jht5945/rust_util.git synced 2025-12-29 08:30:04 +08:00

fix parse_size

This commit is contained in:
2019-07-22 01:27:56 +08:00
parent 37bde2e066
commit 68e7818c27

View File

@@ -154,19 +154,21 @@ pub fn print_lastline(line: &str) {
pub fn parse_size(size: &str) -> XResult<i64> { pub fn parse_size(size: &str) -> XResult<i64> {
let lower_size = size.to_lowercase(); let lower_size = size.to_lowercase();
if lower_size.ends_with("b") { let no_last_b_size = if lower_size.ends_with("b") {
let no_last_b_size = &lower_size[0..lower_size.len()-1]; &lower_size[0..lower_size.len()-1]
if no_last_b_size.ends_with("k") { } else {
return Ok((SIZE_KB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64); &lower_size
} else if no_last_b_size.ends_with("m") { };
return Ok((SIZE_MB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64); if no_last_b_size.ends_with("k") {
} else if no_last_b_size.ends_with("g") { return Ok((SIZE_KB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
return Ok((SIZE_GB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64); } else if no_last_b_size.ends_with("m") {
} else if no_last_b_size.ends_with("t") { return Ok((SIZE_MB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
return Ok((SIZE_TB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64); } else if no_last_b_size.ends_with("g") {
} else if no_last_b_size.ends_with("p") { return Ok((SIZE_GB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
return Ok((SIZE_PB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64); } else if no_last_b_size.ends_with("t") {
} return Ok((SIZE_TB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
} else if no_last_b_size.ends_with("p") {
return Ok((SIZE_PB as f64 * no_last_b_size[0..no_last_b_size.len()-1].parse::<f64>()?) as i64);
} }
Err(new_box_error(&format!("Cannot parse size: {}", size))) Err(new_box_error(&format!("Cannot parse size: {}", size)))