From 0f3d9add451a0e200308af2809ff8fab15bd133d Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Fri, 10 Dec 2021 12:26:20 +0800
Subject: [PATCH] refactor: rename mappings to map

---
 _fixtures/transflows/transflows.yaml      | 2 +-
 examples/_quake/transflows.yaml           | 2 +-
 quake_core/src/entry/entry_define.rs      | 2 +-
 quake_core/src/transflow/transflow.rs     | 1 +
 quake_core/src/usecases/entry_usecases.rs | 2 +-
 src/main.rs                               | 5 +++--
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/_fixtures/transflows/transflows.yaml b/_fixtures/transflows/transflows.yaml
index 5a591b9e..bd450105 100644
--- a/_fixtures/transflows/transflows.yaml
+++ b/_fixtures/transflows/transflows.yaml
@@ -5,7 +5,7 @@
     - name: "from_todo_blog_to_quake_calendar_timeline"
       from: [ "todo", "blog" ]
       to: "<quake-calendar-timeline>"
-      mappings:
+      map:
         - entry: "todo"
           source: ["title", "content", "created_date", "updated_date"]
           target: ["title", "content", "start_time", "end_time"]
diff --git a/examples/_quake/transflows.yaml b/examples/_quake/transflows.yaml
index dc42f441..c9bf42be 100644
--- a/examples/_quake/transflows.yaml
+++ b/examples/_quake/transflows.yaml
@@ -5,7 +5,7 @@
     - name: "from_todo_blog_to_quake_calendar_timeline"
       from: [ "todo", "blog" ]
       to: "<quake-calendar-timeline>"
-      mappings:
+      map:
         - entry: "todo"
           source: ["title", "content", "created_date", "updated_date"]
           target: ["title", "content", "created_date", "updated_date"]
diff --git a/quake_core/src/entry/entry_define.rs b/quake_core/src/entry/entry_define.rs
index 2f063e85..3a083776 100644
--- a/quake_core/src/entry/entry_define.rs
+++ b/quake_core/src/entry/entry_define.rs
@@ -85,7 +85,7 @@ impl EntryDefine {
         let date = quake_time::date_now();
 
         let mut map = IndexMap::new();
-        map.insert("title".to_string(), title);
+        map.insert("title".to_string(), format!("{:}", title));
         map.insert("created_date".to_string(), date.clone());
         map.insert("updated_date".to_string(), date);
 
diff --git a/quake_core/src/transflow/transflow.rs b/quake_core/src/transflow/transflow.rs
index 21c6408e..0bd72103 100644
--- a/quake_core/src/transflow/transflow.rs
+++ b/quake_core/src/transflow/transflow.rs
@@ -74,6 +74,7 @@ pub struct Flow {
     pub name: String,
     pub from: Vec<String>,
     pub to: String,
+    #[serde(rename = "map")]
     pub mappings: Option<Vec<Mapping>>,
     pub filter: String,
 }
diff --git a/quake_core/src/usecases/entry_usecases.rs b/quake_core/src/usecases/entry_usecases.rs
index 10a000a5..313b3097 100644
--- a/quake_core/src/usecases/entry_usecases.rs
+++ b/quake_core/src/usecases/entry_usecases.rs
@@ -108,7 +108,7 @@ pub fn update_entry_fields(
 
     for (key, value) in update_map {
         if key != "content" {
-            entry_file.update_field(key, value);
+            entry_file.update_field(key, &format!("{:?}", value));
         }
     }
 
diff --git a/src/main.rs b/src/main.rs
index 2169f16f..bfc187c8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -137,8 +137,9 @@ fn config_quake(cmd: &Command) -> Result<QuakeConfig, Box<dyn Error>> {
 }
 
 fn load_config(path: &String) -> Result<QuakeConfig, Box<dyn Error>> {
-    let content = fs::read_to_string(path)?;
-    let conf: QuakeConfig = serde_yaml::from_str(content.as_str())?;
+    let content =
+        fs::read_to_string(path).expect("lost .quake.yaml config, please run `quake init`");
+    let conf: QuakeConfig = serde_yaml::from_str(content.as_str()).expect("serde .quake.yml error");
 
     Ok(conf)
 }