zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix(apb): .id() now works on json strings too

Browse source
This commit is contained in:
əlemi 2024-04-13 06:34:56 +02:00
parent 9c9b5ec380
commit 87d802fa2e
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apb/src/types/base.rs
View file

@ -32,8 +32,21 @@ impl Base for String {
#[cfg(feature = "unstructured")]
impl Base for serde_json::Value {
crate::getter! { id -> &str }
crate::getter! { base_type -> type BaseType }
fn base_type(&self) -> Option<BaseType> {
if self.is_string() {
Some(BaseType::Link(LinkType::Link))
} else {
self.get("type")?.as_str()?.try_into().ok()
}
}
fn id(&self) -> Option<&str> {
if self.is_string() {
self.as_str()
} else {
self.get("id").map(|x| x.as_str())?
}
}
}
#[cfg(feature = "unstructured")]

14
apb/src/types/link.rs
View file

@ -37,16 +37,10 @@ impl Link for String {
impl Link for serde_json::Value {
// TODO this can fail, but it should never do!
fn href(&self) -> &str {
match self {
serde_json::Value::String(x) => x,
serde_json::Value::Object(map) =>
map.get("href")
.map(|h| h.as_str().unwrap_or(""))
.unwrap_or(""),
_ => {
tracing::error!("failed getting href on invalid json Link object");
""
},
if self.is_string() {
self.as_str().unwrap_or("")
} else {
self.get("href").map(|x| x.as_str().unwrap_or("")).unwrap_or("")
}
}