From 24a8eba20b2faa4439d32b6c1d6be8c30f78e249 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sun, 15 Dec 2019 11:36:48 +0800
Subject: [PATCH] use struct.f

---
 src/config_util.rs |  9 ++++++++-
 src/main.rs        | 18 +++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/config_util.rs b/src/config_util.rs
index 6c7dafa..a810c81 100644
--- a/src/config_util.rs
+++ b/src/config_util.rs
@@ -62,7 +62,14 @@ pub struct OSSBackupdConfig {
     pub items: Vec<OSSBackupdConfigItem>,
 }
 
-pub fn make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_item: &OSSBackupdConfigItem, suffix: &str) -> String {
+impl OSSBackupdConfigItem {
+
+    pub fn make_oss_key(&self, oss_backupd_config: &OSSBackupdConfig, suffix: &str) -> String {
+        real_make_oss_key(oss_backupd_config, &self, suffix)
+    }
+}
+
+fn real_make_oss_key(oss_backupd_config: &OSSBackupdConfig, oss_backupd_config_item: &OSSBackupdConfigItem, suffix: &str) -> String {
     let mut key = String::with_capacity(1024);
     key.push_str(&(if oss_backupd_config.prefix.is_some() {
        remove_start_end_slash(&oss_backupd_config.prefix.as_ref().unwrap().as_str())
diff --git a/src/main.rs b/src/main.rs
index 8a2d3b6..9643f3f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -57,17 +57,13 @@ fn main() -> XResult<()> {
 
     // TODO ...
 
-    
-    // let j = config_json.unwrap();
-    // println!("{}", j);
-    // let c = parse_config(&j);
-    // println!("{:?}", c);
-    // println!("");
-    // for i in &c.items {
-    //     println!("{:?}", i);
-    //     println!("{}", make_oss_key(&c, &i, "gpg"));
-    //     println!("{}", make_oss_key(&c, &i, "asc"));
-    // }
+    println!("{:?}", oss_backupd_config);
+    println!("");
+    for i in &oss_backupd_config.items {
+        println!("{:?}", i);
+        println!("{}", i.make_oss_key(&oss_backupd_config, "gpg"));
+        println!("{}", i.make_oss_key(&oss_backupd_config, "asc"));
+    }
 
     Ok(())
 }