mdtools/mdq
mdtools/mdq
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor

Browse source
This commit is contained in:
JMARyA 2024-02-09 13:50:20 +01:00
parent cee90de28f
commit 8fd47c7d49
Signed by: jmarya
GPG key ID: 901B2ADDF27C2263
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib.rs
View file

@ -1,7 +1,4 @@
use std::{ use std::collections::{HashMap, HashSet};
cmp::Ordering,
collections::{HashMap, HashSet},
};
/// get frontmatter from markdown document /// get frontmatter from markdown document
#[must_use] #[must_use]
@ -22,7 +19,7 @@ trait ToYaml {
impl ToYaml for serde_json::Value { impl ToYaml for serde_json::Value {
fn to_yaml(&self) -> serde_yaml::Value { fn to_yaml(&self) -> serde_yaml::Value {
let str = serde_yaml::to_string(self).unwrap(); let str = serde_yaml::to_string(self).unwrap();
return serde_yaml::from_str(&str).unwrap(); serde_yaml::from_str(&str).unwrap()
} }
} }
@ -33,7 +30,7 @@ trait ToJson {
impl ToJson for serde_yaml::Value { impl ToJson for serde_yaml::Value {
fn to_json(&self) -> serde_json::Value { fn to_json(&self) -> serde_json::Value {
let str = serde_json::to_string(self).unwrap(); let str = serde_json::to_string(self).unwrap();
return serde_json::from_str(&str).unwrap(); serde_json::from_str(&str).unwrap()
} }
} }
@ -206,8 +203,8 @@ impl Index {
match res { match res {
Ok(valid) => Ok(valid), Ok(valid) => Ok(valid),
Err(e) => match e { Err(e) => match e {
jsonfilter::FilterError::InvalidFilter => Err(e), jsonfilter::FilterError::InvalidFilter
jsonfilter::FilterError::UnknownOperator => Err(e), | jsonfilter::FilterError::UnknownOperator => Err(e),
jsonfilter::FilterError::KeyNotFound => Ok(false), jsonfilter::FilterError::KeyNotFound => Ok(false),
}, },
} }
@ -328,10 +325,11 @@ impl Document {
.as_mapping() .as_mapping()
.unwrap() .unwrap()
.get(key) .get(key)
.map_or_else(|| serde_json::Value::Null, |x| x.to_json()) .map_or_else(|| serde_json::Value::Null, ToJson::to_json)
} }
} }
#[must_use]
pub fn get_full_frontmatter(&self) -> serde_json::Value { pub fn get_full_frontmatter(&self) -> serde_json::Value {
let mut frontmatter = self.frontmatter.to_json(); let mut frontmatter = self.frontmatter.to_json();
let frontmatter_obj = frontmatter.as_object_mut().unwrap(); let frontmatter_obj = frontmatter.as_object_mut().unwrap();