dot013/mdparser
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

fix(npf): remove unecessary parent check

Browse Source
This commit is contained in:
Gustavo "Guz" L. de Mello
2024-04-29 14:58:03 -03:00
parent 21e42dec52
commit b1ed042dad
1 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/convert/npf.rs
View File

@@ -164,51 +164,43 @@ impl<'a> TryFrom<&'a Node<'a, RefCell<Ast>>> for objects::Post {
Ok(post)
}
NodeValue::Image(i) => {
let alt_text = Self::try_from(node.children())?.fold_content();
if let Some(p) = node.parent() {
if let NodeValue::Paragraph = p.data.borrow().value {
let alt_text = alt_text
.content
.iter()
.find(|b| {
if let BlockValue::Text(_) = b {
true
} else {
false
}
})
.unwrap_or(BlockValue::Text(BlockText::new("")).borrow())
.to_owned();
let alt_text = if let BlockValue::Text(t) = alt_text {
Some(t.text.clone())
let alt_text = Self::try_from(node.children())?
.fold_content()
.content
.iter()
.find(|b| {
if let BlockValue::Text(_) = b {
true
} else {
None
};
false
}
})
.unwrap_or(BlockValue::Text(BlockText::new("")).borrow())
.to_owned();
let alt_text = if let BlockValue::Text(t) = alt_text {
Some(t.text.clone())
} else {
None
};
let media = if let Ok(url) = url::Url::from_str(&i.url) {
Media::from(url)
} else if let Some(name) = path::Path::new(&i.url).file_name() {
if let Some(name) = name.to_str() {
Media::from(name)
} else {
Media::from(i.url.as_str())
}
} else {
Media::from(i.url.as_str())
};
let mut block = BlockImage::from(media);
block.alt_text = alt_text;
let mut post = Self::new(0);
post.content.push(BlockValue::Image(block));
Ok(post)
let media = if let Ok(url) = url::Url::from_str(&i.url) {
Media::from(url)
} else if let Some(name) = path::Path::new(&i.url).file_name() {
if let Some(name) = name.to_str() {
Media::from(name)
} else {
Ok(alt_text)
Media::from(i.url.as_str())
}
} else {
Ok(alt_text)
}
Media::from(i.url.as_str())
};
let mut block = BlockImage::from(media);
block.alt_text = alt_text;
let mut post = Self::new(0);
post.content.push(BlockValue::Image(block));
Ok(post)
}
_ => Ok(Self::new(0)),
}
@@ -457,7 +449,7 @@ mod tests {
let markdown = "If **you** are reading this, thanks for giving a look\n\
and checking the ~~ugly~~ source code of this *little\n\
**personal** project*. It is heart warming to know that *at least*\n\
[someone](t:_YENQUPzd_oPpmVDqZQ-yw) found this interesting and maybe useful, ![even knowing](image.png)\n\
[someone](t:_YENQUPzd_oPpmVDqZQ-yw) found this interesting and maybe useful, even knowing\n\
how niched this whole project is.\\
- [Gustavo \"Guz\" L. de Mello](https://guz.one), Apr 16, 12.2024";