From 2f7ff048a79fe85f34d4c4a67d22c9ab784fc4d1 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Fri, 3 Apr 2020 08:03:19 +0800
Subject: [PATCH] add fn get_safe_backup_count

---
 src/config_util.rs | 10 ++++++++++
 src/main.rs        |  9 ++-------
 src/oss_util.rs    |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/config_util.rs b/src/config_util.rs
index ba055e9..443b9f6 100644
--- a/src/config_util.rs
+++ b/src/config_util.rs
@@ -93,6 +93,16 @@ impl OSSBackupdConfigItem {
             None => "default_file_name".to_owned(),
         }
     }
+
+    pub fn get_safe_backup_count(&self) -> usize {
+        let mut backup_count = self.backup_count.unwrap_or(10u32) as usize;
+        if backup_count < 1_usize {
+            backup_count = 1_usize;
+        } else if backup_count > 10000_usize {
+            backup_count = 10000_usize;
+        }
+        backup_count
+    }
 }
 
 fn real_make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_item: &OSSBackupdConfigItem, suffix: &str) -> String {
diff --git a/src/main.rs b/src/main.rs
index b0da945..55c94a9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -104,12 +104,7 @@ pub fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem
     }
 
     let oss_client = OSSClient::new(endpoint, access_key_id, access_key_secret);
-    let mut backup_count = config_item.backup_count.unwrap_or(10u32) as usize;
-    if backup_count < 1_usize {
-        backup_count = 1_usize;
-    } else if backup_count > 10000_usize {
-        backup_count = 10000_usize;
-    }
+    let backup_count = config_item.get_safe_backup_count();
     let meta_file_name = &format!("{}/ossbackupd_meta_{}_{}.json", &oss_backupd_config.get_prefix(), &oss_backupd_config.get_host(), &config_item.get_file_name());
     let new_file = format!("{}/{}", path, config_item.make_oss_key(&oss_backupd_config, "gpg"));
 
@@ -171,7 +166,7 @@ pub fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem
     if options.verbose {
         print_message(MessageType::DEBUG, &format!("Upload file: {}", temp_pgp_file));
     }
-    if let Err(e) = oss_client.put_file(bucket, &new_file, oss_util::DEFAULT_URL_VALID_SECS, file_temp_pgp_file) {
+    if let Err(e) = oss_client.put_file(bucket, &new_file, oss_util::DEFAULT_URL_VALID_IN_SECS, file_temp_pgp_file) {
         print_message(MessageType::ERROR, &format!("Error in encrypt file: {}, at item index: {}", e, item_index));
         remove_temp_files();
         return Ok(());
diff --git a/src/oss_util.rs b/src/oss_util.rs
index 0206eda..6ede442 100644
--- a/src/oss_util.rs
+++ b/src/oss_util.rs
@@ -15,7 +15,7 @@ use reqwest::{
 };
 use rust_util::*;
 
-pub const DEFAULT_URL_VALID_SECS: u64 = 1000;
+pub const DEFAULT_URL_VALID_IN_SECS: u64 = 1000;
 
 pub const OSS_VERB_GET: &str = "GET";
 pub const OSS_VERB_PUT: &str = "PUT";