cli: add json flag to query command

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -62,6 +62,7 @@
 * sdk: add support to embedded tor client ([Yuki Kishimoto])
 * ffi(nostr): add `EventBuilder::seal` constructor ([Yuki Kishimoto])
 * cli: add `generate` command ([Yuki Kishimoto])
+* cli: add `json` flag to `query` command ([Yuki Kishimoto])
 * book: add some python examples ([RydalWater])
 
 ### Fixed

crates/nostr-cli/src/cli/mod.rs

@@ -85,6 +85,9 @@ pub enum Command {
         /// Print result
         #[clap(long)]
         print: bool,
+        /// Print result as JSON (require `print` flag!)
+        #[clap(long)]
+        json: bool,
     },
     /// Database
     #[command(arg_required_else_help = true)]

crates/nostr-cli/src/main.rs

@@ -188,6 +188,7 @@ async fn handle_command(command: Command, client: &Client) -> Result<()> {
             reverse,
             database,
             print,
+            json,
         } => {
             let db = client.database();
 
@@ -246,7 +247,7 @@ async fn handle_command(command: Command, client: &Client) -> Result<()> {
                 );
                 if print {
                     // Print events
-                    util::print_events(events);
+                    util::print_events(events, json);
                 }
             } else {
                 // Query relays

crates/nostr-cli/src/util.rs

@@ -2,26 +2,32 @@
 // Copyright (c) 2023-2024 Rust Nostr Developers
 // Distributed under the MIT software license
 
-use nostr_sdk::Event;
+use nostr_sdk::prelude::*;
 use prettytable::{row, Table};
 
-pub fn print_events<I>(events: I)
+pub fn print_events<I>(events: I, json: bool)
 where
     I: IntoIterator<Item = Event>,
 {
-    let mut table = Table::new();
+    if json {
+        for (index, event) in events.into_iter().enumerate() {
+            println!("{}. {}", index + 1, event.as_pretty_json());
+        }
+    } else {
+        let mut table: Table = Table::new();
 
-    table.set_titles(row!["#", "ID", "Author", "Kind", "Created At",]);
+        table.set_titles(row!["#", "ID", "Author", "Kind", "Created At"]);
 
-    for (index, event) in events.into_iter().enumerate() {
-        table.add_row(row![
-            index + 1,
-            event.id,
-            event.author(),
-            event.kind(),
-            event.created_at.to_human_datetime()
-        ]);
-    }
+        for (index, event) in events.into_iter().enumerate() {
+            table.add_row(row![
+                index + 1,
+                event.id,
+                event.author(),
+                event.kind(),
+                event.created_at.to_human_datetime()
+            ]);
+        }
 
-    table.printstd();
+        table.printstd();
+    }
 }