raw output will now display nothing else

fmt

Cargo.toml

@@ -11,8 +11,9 @@ clap = { version = "^2.33", features = ["yaml"] }
 image-base64 = "0.1.0"
 image = "0.23.9"
 asciify = "0.1.6"
-async-minecraft-ping = { git="https://github.com/LordMZTE/async-minecraft-ping.git", tag="v0.2.2" }
+async-minecraft-ping = { path="../../../async-minecraft-ping/async-minecraft-ping" }
 tokio = { version = "0.2.22", features = ["full"] }
 itertools = "0.9.0"
 termcolor = "1"
 anyhow = "1.0.32"
+serde_json = "1.0.58"

src/lib.rs

@@ -2,12 +2,12 @@ use asciify::AsciiBuilder;
 
 /// prints a table with the entries supplied
 /// the identifier at the start of each entry sets the type
-/// 
+///
 /// l = list entry
 /// b = block
 /// lo = list entry option
 /// bo = block option
-/// 
+///
 /// options are checked if they are `Some` and won't be printed if they aren't
 #[macro_export]
 macro_rules! print_table {
@@ -42,7 +42,8 @@ macro_rules! print_table {
 
 /// returns an `Option` of the expression passed in
 /// `None` if the `is_empty` on the expression returns true, `Some(x)` otherwise
-/// this is a macro and not a function because `is_empty` is not defined in any trait
+/// this is a macro and not a function because `is_empty` is not defined in any
+/// trait
 #[macro_export]
 macro_rules! none_if_empty {
     ($x:expr) => {

src/main.rs

@@ -11,7 +11,7 @@ use tokio::time;
 
 use anyhow::{Context, Result};
 use asciify::AsciiBuilder;
-use async_minecraft_ping::{ConnectionConfig, ModInfo, ServerDescription};
+use async_minecraft_ping::{ConnectionConfig, ModInfo, ServerDescription, StatusResponse};
 use clap::App;
 use image::ImageFormat;
 use itertools::Itertools;
@@ -24,7 +24,7 @@ async fn main() -> Result<()> {
     let yaml = load_yaml!("args.yml");
     let matches = App::from_yaml(yaml).get_matches();
 
-    //region Network
+    // region Network
     let config = ConnectionConfig::build(
         matches
             .value_of("ip")
@@ -54,7 +54,7 @@ async fn main() -> Result<()> {
             .context("invalid protocol version")?,
     );
 
-    //create timeout for server connection
+    // create timeout for server connection
     let mut timeout = time::delay_for(Duration::from_millis(
         matches
             .value_of("timeout")
@@ -63,16 +63,23 @@ async fn main() -> Result<()> {
             .context("timeout is invalid value")?,
     ));
 
-    let (response, raw_response) = tokio::select! {
+    let raw_response = tokio::select! {
         _ = &mut timeout => Err(anyhow!("Connection to server timed out")),
         r = async {
             let mut con = config.connect().await?;
-            con.status().await
+            con.status_raw().await
         } => r,
     }?;
-    //endregion
 
-    //region Image
+    if matches.is_present("raw") {
+        println!("{}", raw_response);
+        return Ok(());
+    }
+
+    let response = serde_json::from_str::<StatusResponse>(&raw_response)?;
+    // endregion
+
+    // region Image
     let image_size: u32 = matches
         .value_of("size")
         .context("failed to get value from args")?
@@ -81,7 +88,7 @@ async fn main() -> Result<()> {
     let mut image = None;
 
     if let (Some(favicon), true) = (response.favicon, matches.is_present("image")) {
-        //The image parsing and asciifying is done while the table is printing
+        // The image parsing and asciifying is done while the table is printing
         image = Some(tokio::spawn(asciify_base64_image(
             favicon,
             AsciiConfig {
@@ -92,9 +99,9 @@ async fn main() -> Result<()> {
             },
         )));
     }
-    //endregion
+    // endregion
 
-    //region printing
+    // region printing
     let player_sample = response
         .players
         .sample
@@ -106,7 +113,6 @@ async fn main() -> Result<()> {
 
     print_table! {
         40;
-        bo "Raw Json" => if matches.is_present("raw") {Some(raw_response)} else {None},
         bo "Description" => none_if_empty!(remove_formatting(&response.description.get_text())),
         bo "Extra Description" => {
             if let ServerDescription::Big(big_desc) = response.description {
@@ -135,7 +141,7 @@ async fn main() -> Result<()> {
     if let Some(img) = image {
         println!("\n{}", img.await??);
     }
-    //endregion
+    // endregion
     Ok(())
 }
 
@@ -149,7 +155,8 @@ async fn asciify_base64_image(favicon: String, config: AsciiConfig) -> Result<St
     let builder = config.apply(AsciiBuilder::new_from_image(image));
 
     let mut buf = if config.colored {
-        //this does not write to stdout but just gets the correct color information for stdout
+        // this does not write to stdout but just gets the correct color
+        // information for stdout
         let mut buf = BufferWriter::stdout(ColorChoice::Always).buffer();
         builder.to_stream_colored(&mut buf);
         buf
@@ -158,16 +165,16 @@ async fn asciify_base64_image(favicon: String, config: AsciiConfig) -> Result<St
         builder.to_stream(&mut buf);
         buf
     };
-    //reset color
+    // reset color
     buf.reset()?;
 
     let bytes = buf.as_slice().to_vec();
 
-    //only check utf8 format in debug mode
+    // only check utf8 format in debug mode
     #[cfg(debug_assertions)]
     let out = String::from_utf8(bytes).expect("asciifyed image is invalid utf8");
     #[cfg(not(debug_assertions))]
-    //bytes should always be valid utf8
+    // bytes should always be valid utf8
     let out = unsafe { String::from_utf8_unchecked(bytes) };
 
     Ok(out)