From 83cfb5489cc58bbb7870ec4f95ae94c5e69617de Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 12 Apr 2020 14:52:13 +0800 Subject: [PATCH] ref unwrap_or_else --- src/main.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index 839b1be..b06149c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -179,18 +179,16 @@ fn process_oss_files(options: &Options, oss_client: &OSSClient, bucket_name: &st if options.verbose { print_message(MessageType::DEBUG, &format!("Read meta file: {}", meta_file_key)); } - let meta_file_content = match oss_client.get_file_content(bucket_name, meta_file_key)? { - Some(c) => c, None => "[]".to_owned(), - }; + let meta_file_content = oss_client.get_file_content(bucket_name, meta_file_key)?.unwrap_or_else(|| "[]".to_owned()); if options.verbose { print_message(MessageType::DEBUG, &format!("Read meta file content: {}", &meta_file_content)); } - let (removed_file, new_meta_file_content) = process_new_backup_file(&meta_file_content, new_file, limit)?; + let (removed_files, new_meta_file_content) = process_new_backup_file(&meta_file_content, new_file, limit)?; if options.verbose { print_message(MessageType::DEBUG, &format!("Processed meta file content: {}", &new_meta_file_content)); } oss_client.put_file_content(bucket_name, meta_file_key, &new_meta_file_content)?; - for rm_file in removed_file { + for rm_file in removed_files { print_message(MessageType::INFO, &format!("Remove OSS key: {}", &rm_file)); oss_client.delete_file(bucket_name, &rm_file)?; } @@ -205,9 +203,7 @@ fn process_new_backup_file(backup_content_json: &str, new_item: &str, limit: usi } parsed_vec.push(new_item.to_string()); - let stringifyed_json = stringity_json_array(&parsed_vec)?; - - Ok((removed_vec, stringifyed_json)) + Ok((removed_vec, stringity_json_array(&parsed_vec)?)) } // stringify JSON array