Archives/xplr
2
0
Fork 0
mirror of https://github.com/sayanarijit/xplr synced 2024-11-04 18:00:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actually validate the passed message

Browse Source
This commit is contained in:
Arijit Basu 2022-10-26 14:24:55 +05:30
parent baa8759d68
commit b05e702536
No known key found for this signature in database
GPG Key ID: 0F8EF5258DC38077
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli.rs
View File

@ -1,5 +1,6 @@
use crate::{app, yaml};
use anyhow::{bail, Context, Result};
use app::ExternalMsg;
use serde_json as json;
use std::fs::File;
use std::io::{BufRead, BufReader, Write};
@ -216,10 +217,10 @@ fn fmt_msg_in(args: Vec<String>) -> Result<String> {
// Since we'll mostly by passing json using `-m`, and json is faster than yaml
// let's try to validate using json first.
let msg = if let Ok(val) = json::from_str::<json::Value>(&msg) {
let msg = if let Ok(val) = json::from_str::<ExternalMsg>(&msg) {
json::to_string(&val)?
} else {
let val: yaml::Value = yaml::from_str(&msg)?;
let val: ExternalMsg = yaml::from_str(&msg)?;
json::to_string(&val)?
};