diff --git a/src/config_util.rs b/src/config_util.rs index c413543..4ddbadb 100644 --- a/src/config_util.rs +++ b/src/config_util.rs @@ -101,8 +101,7 @@ fn real_make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_i key.push_str("/"); key.push_str(&oss_backupd_config_item.get_file_name()); key.push_str("_"); - let ymdhms = Utc::now().format("%Y%m%d_%H%M%S").to_string(); - key.push_str(&ymdhms); + key.push_str(&get_now_ymdhms()); if !suffix.is_empty() { key.push_str(&format!(".{}", suffix)); @@ -111,6 +110,10 @@ fn real_make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_i key } +pub fn get_now_ymdhms() -> String { + Utc::now().format("%Y%m%d_%H%M%S").to_string() +} + pub fn remove_start_end_slash(s: &str) -> String { let mut ss = s; while ss.starts_with("/") { diff --git a/src/opt.rs b/src/opt.rs index f151df1..f41965b 100644 --- a/src/opt.rs +++ b/src/opt.rs @@ -19,7 +19,7 @@ impl Options { Options { version: false, verbose: false, - config: "".to_string(), + config: "".to_owned(), } } diff --git a/src/oss_util.rs b/src/oss_util.rs index ec0862d..9afb700 100644 --- a/src/oss_util.rs +++ b/src/oss_util.rs @@ -125,5 +125,3 @@ fn get_current_secs() -> u64 { SystemTime::now().duration_since(SystemTime::UNIX_EPOCH).unwrap().as_secs() } -// use sync meta.txt file ? -// record valid files ... diff --git a/src/zip_util.rs b/src/zip_util.rs index 474c95e..2254675 100644 --- a/src/zip_util.rs +++ b/src/zip_util.rs @@ -45,7 +45,7 @@ pub fn zip_file(target: &str, zip_file: &str) -> XResult<()> { copy_io_with_head(&mut File::open(target_path)?, &mut zip, -1, "Compressing")?; zip.finish()?; - } else { + } else { // TODO when target is PATH! let mut_zip = RefCell::new(zip); walk_dir(&target_path, &|p, e| { print_message(MessageType::WARN, &format!("Compress {} failed: {}", &p.display(), &e));