fix: normalize json output style

Author: Thaumy

src/display/json/fav.rs

@@ -1,16 +1,14 @@
 use crate::api::fav::get_list::FavEntry;
-use crate::display::json::fmt_err;
-use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::display::json::{fmt_err, fmt_ok};
 use anyhow::Result;
 
-pub fn list_fav(fav_iter: Result<impl ExactSizeIterator<Item = FavEntry>>) -> Result<String> {
+pub fn list_fav(fav_iter: Result<impl ExactSizeIterator<Item = FavEntry>>) -> String {
     let fav_iter = match fav_iter {
         Ok(o) => o,
-        Err(e) => return fmt_err(&e).into_ok(),
+        Err(e) => return fmt_err(&e),
     };
 
     let vec = fav_iter.collect::<Vec<_>>();
 
-    json::serialize(vec)
+    fmt_ok(vec)
 }

src/display/json/ing.rs

@@ -1,17 +1,15 @@
 use crate::api::ing::get_comment_list::IngCommentEntry;
 use crate::api::ing::get_list::IngEntry;
-use crate::display::json::fmt_err;
-use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::display::json::{fmt_err, fmt_ok};
 use anyhow::Result;
 use serde_json::json;
 
 pub fn list_ing(
     ing_with_comment_list: Result<impl ExactSizeIterator<Item = (IngEntry, Vec<IngCommentEntry>)>>,
-) -> Result<String> {
+) -> String {
     let ing_with_comment_list = match ing_with_comment_list {
         Ok(o) => o,
-        Err(e) => return fmt_err(&e).into_ok(),
+        Err(e) => return fmt_err(&e),
     };
 
     let json_vec = ing_with_comment_list
@@ -23,5 +21,5 @@ pub fn list_ing(
         })
         .collect::<Vec<_>>();
 
-    json::serialize(json_vec)
+    fmt_ok(json_vec)
 }

src/display/json/mod.rs

@@ -7,26 +7,29 @@ pub mod user;
 use anyhow::Result;
 use serde::Serialize;
 use serde_json::json;
+use std::fmt::Display;
 
 #[inline]
-pub fn fmt_err(e: &anyhow::Error) -> String {
+pub fn fmt_ok(t: impl Serialize) -> String {
+    let json = json!({
+        "is_ok": true,
+        "msg": t
+    });
+    json.to_string()
+}
+
+#[inline]
+pub fn fmt_err(e: impl ToString) -> String {
     let json = json!({
         "is_ok": false,
         "msg": e.to_string()
     });
     json.to_string()
 }
 
-pub fn fmt_result<T: Serialize, E: ToString>(result: &Result<T, E>) -> String {
-    let json = match result {
-        Ok(t) => json!({
-            "is_ok": true,
-            "msg": t
-        }),
-        Err(e) => json!({
-            "is_ok": false,
-            "msg": e.to_string()
-        }),
-    };
-    json.to_string()
+pub fn fmt_result<T: Serialize, E: Display>(result: &Result<T, E>) -> String {
+    match result {
+        Ok(t) => fmt_ok(t),
+        Err(e) => fmt_err(e),
+    }
 }

src/display/json/news.rs

@@ -1,16 +1,14 @@
 use crate::api::news::get_list::NewsEntry;
-use crate::display::json::fmt_err;
-use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::display::json::{fmt_err, fmt_ok};
 use anyhow::Result;
 
-pub fn list_news(news_iter: Result<impl ExactSizeIterator<Item = NewsEntry>>) -> Result<String> {
+pub fn list_news(news_iter: Result<impl ExactSizeIterator<Item = NewsEntry>>) -> String {
     let news_iter = match news_iter {
         Ok(o) => o,
-        Err(e) => return fmt_err(&e).into_ok(),
+        Err(e) => return fmt_err(&e),
     };
 
     let vec = news_iter.collect::<Vec<_>>();
 
-    json::serialize(vec)
+    fmt_ok(vec)
 }

src/display/json/post.rs

@@ -1,8 +1,6 @@
 use crate::api::post::get_comment_list::PostCommentEntry;
 use crate::api::post::get_one::PostEntry;
-use crate::display::json::{fmt_err, fmt_result};
-use crate::infra::json;
-use crate::infra::result::IntoResult;
+use crate::display::json::{fmt_err, fmt_ok, fmt_result};
 use anyhow::Result;
 use serde_json::json;
 
@@ -18,7 +16,7 @@ pub fn list_post(result: Result<(impl ExactSizeIterator<Item = PostEntry>, usize
        "total_count": total_count,
        "entry_list": vec,
     });
-    json.to_string()
+    fmt_ok(json)
 }
 
 pub fn show_post(entry: &Result<PostEntry>) -> String {
@@ -37,14 +35,14 @@ pub fn show_post_meta(entry: &Result<PostEntry>) -> String {
 
 pub fn show_post_comment(
     comment_iter: Result<impl ExactSizeIterator<Item = PostCommentEntry>>,
-) -> Result<String> {
+) -> String {
     let comment_iter = match comment_iter {
         Ok(entry) => entry,
-        Err(e) => return fmt_err(&e).into_ok(),
+        Err(e) => return fmt_err(&e),
     };
 
     let comment_vec = comment_iter.collect::<Vec<_>>();
-    json::serialize(comment_vec)
+    fmt_ok(comment_vec)
 }
 
 pub fn search_post(result: Result<(impl ExactSizeIterator<Item = usize>, usize)>) -> String {
@@ -59,5 +57,5 @@ pub fn search_post(result: Result<(impl ExactSizeIterator<Item = usize>, usize)>
        "total_count": total_count,
        "id_list": id_list,
     });
-    json.to_string()
+    fmt_ok(json)
 }

src/display/mod.rs

@@ -47,7 +47,7 @@ pub fn list_ing(
     match style {
         Style::Colorful => colorful::ing::list_ing(time_style, ing_with_comment_iter, align),
         Style::Normal => normal::ing::list_ing(time_style, ing_with_comment_iter, align),
-        Style::Json => json::ing::list_ing(ing_with_comment_iter),
+        Style::Json => json::ing::list_ing(ing_with_comment_iter).into_ok(),
     }
 }
 
@@ -106,7 +106,7 @@ pub fn show_post_comment(
     match style {
         Style::Colorful => colorful::post::show_post_comment(time_style, comment_iter),
         Style::Normal => normal::post::show_post_comment(time_style, comment_iter),
-        Style::Json => json::post::show_post_comment(comment_iter),
+        Style::Json => json::post::show_post_comment(comment_iter).into_ok(),
     }
 }
 
@@ -153,7 +153,7 @@ pub fn list_news(
     match style {
         Style::Colorful => colorful::news::list_news(time_style, news_iter),
         Style::Normal => normal::news::list_news(time_style, news_iter),
-        Style::Json => json::news::list_news(news_iter),
+        Style::Json => json::news::list_news(news_iter).into_ok(),
     }
 }
 
@@ -165,6 +165,6 @@ pub fn list_fav(
     match style {
         Style::Colorful => colorful::fav::list_fav(time_style, fav_iter),
         Style::Normal => normal::fav::list_fav(time_style, fav_iter),
-        Style::Json => json::fav::list_fav(fav_iter),
+        Style::Json => json::fav::list_fav(fav_iter).into_ok(),
     }
 }