refactor: extract json_display

sdgb-cli/src/main.rs

@@ -1,9 +1,6 @@
-use std::{
+use std::sync::{
-    io::stdout,
+    Arc,
-    sync::{
+    atomic::{AtomicBool, Ordering},
-        Arc,
-        atomic::{AtomicBool, Ordering},
-    },
 };
 
 use nyquest_preset::nyquest::ClientBuilder;
@@ -28,7 +25,7 @@ use spdlog::{error, info, warn};
 
 use crate::{
     commands::Cli,
-    utils::{human_readable_display, login_action},
+    utils::{human_readable_display, json_display, login_action},
 };
 
 #[cfg(feature = "fetchall")]
@@ -139,8 +136,7 @@ async fn main() -> Result<(), Box<dyn snafu::Error>> {
             }
 
             if !human_readable {
-                let lock = stdout().lock();
+                json_display(resp)?;
-                serde_json::to_writer_pretty(lock, &resp)?;
             }
         }
 

sdgb-cli/src/utils/mod.rs

@@ -48,6 +48,12 @@ pub async fn login_action<R>(
     Ok(return_data)
 }
 
+pub fn json_display(value: impl Serialize) -> Result<(), Box<dyn snafu::Error>> {
+    let lock = stdout().lock();
+    serde_json::to_writer_pretty(lock, &value)?;
+    Ok(())
+}
+
 pub fn human_readable_display(
     value: impl Display + Serialize,
     human_readable: bool,
@@ -55,8 +61,7 @@ pub fn human_readable_display(
     if human_readable {
         println!("{value}");
     } else {
-        let lock = stdout().lock();
+        json_display(value)?;
-        serde_json::to_writer_pretty(lock, &value)?;
     }
 
     Ok(())