FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Update comrak crate

Browse source
This commit is contained in:
silverpill 2023-03-31 18:39:15 +00:00
parent 300d2ef6f8
commit ebbde534af
3 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Cargo.lock generated
View file

@ -576,8 +576,9 @@ dependencies = [
[[package]] [[package]]
name = "comrak" name = "comrak"
version = "0.17.1" version = "0.18.0"
source = "git+https://github.com/kivikakk/comrak?rev=93a94858168536704c5772d5573cdfce0e4e7ed4#93a94858168536704c5772d5573cdfce0e4e7ed4" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "482aa5695bca086022be453c700a40c02893f1ba7098a2c88351de55341ae894"
dependencies = [ dependencies = [
"entities", "entities",
"memchr", "memchr",

2
mitra-utils/Cargo.toml
View file

@ -15,7 +15,7 @@ bs58 = "0.4.0"
# Used for working with dates # Used for working with dates
chrono = { version = "0.4.23", default-features = false, features = ["std"] } chrono = { version = "0.4.23", default-features = false, features = ["std"] }
# Used for parsing markdown # Used for parsing markdown
comrak = { git = "https://github.com/kivikakk/comrak", rev = "93a94858168536704c5772d5573cdfce0e4e7ed4", default-features = false } comrak = { version = "0.18.0", default-features = false }
# Used to guess media type of a file # Used to guess media type of a file
mime_guess = "2.0.3" mime_guess = "2.0.3"
mime-sniffer = "0.1.2" mime-sniffer = "0.1.2"

41
mitra-utils/src/markdown.rs
View file

@ -1,4 +1,7 @@
use std::cell::RefCell;
use comrak::{ use comrak::{
arena_tree::Node,
format_commonmark, format_commonmark,
format_html, format_html,
nodes::{Ast, AstNode, ListType, NodeValue}, nodes::{Ast, AstNode, ListType, NodeValue},
@ -59,6 +62,16 @@ fn node_to_markdown<'a>(
Ok(markdown) Ok(markdown)
} }
fn replace_node_value(node: &AstNode, value: NodeValue) -> () {
let mut borrowed_node = node.data.borrow_mut();
*borrowed_node = Ast::new(value, borrowed_node.sourcepos.start);
}
fn create_node<'a>(value: NodeValue) -> AstNode<'a> {
// Position doesn't matter
Node::new(RefCell::new(Ast::new(value, (0, 1).into())))
}
fn replace_with_markdown<'a>( fn replace_with_markdown<'a>(
node: &'a AstNode<'a>, node: &'a AstNode<'a>,
options: &ComrakOptions, options: &ComrakOptions,
@ -69,8 +82,7 @@ fn replace_with_markdown<'a>(
child.detach(); child.detach();
}; };
let text = NodeValue::Text(markdown); let text = NodeValue::Text(markdown);
let mut borrowed_node = node.data.borrow_mut(); replace_node_value(node, text);
*borrowed_node = Ast::new(text);
Ok(()) Ok(())
} }
@ -90,8 +102,7 @@ fn fix_microsyntaxes<'a>(
}; };
}; };
let text = NodeValue::Text(link_text); let text = NodeValue::Text(link_text);
let mut borrowed_node = node.data.borrow_mut(); replace_node_value(node, text);
*borrowed_node = Ast::new(text);
}; };
}; };
}; };
@ -151,10 +162,9 @@ pub fn markdown_lite_to_html(text: &str) -> Result<String, MarkdownError> {
child.detach(); child.detach();
}; };
let text = NodeValue::Text(markdown); let text = NodeValue::Text(markdown);
let text_node = arena.alloc(AstNode::from(text)); let text_node = arena.alloc(create_node(text));
node.append(text_node); node.append(text_node);
let mut borrowed_node = node.data.borrow_mut(); replace_node_value(node, NodeValue::Paragraph);
*borrowed_node = Ast::new(NodeValue::Paragraph);
}, },
NodeValue::Image(_) => replace_with_markdown(node, &options)?, NodeValue::Image(_) => replace_with_markdown(node, &options)?,
NodeValue::List(_) => { NodeValue::List(_) => {
@ -179,13 +189,15 @@ pub fn markdown_lite_to_html(text: &str) -> Result<String, MarkdownError> {
list_prefix_markdown.replace('1', &item_index_str); list_prefix_markdown.replace('1', &item_index_str);
}; };
}; };
let list_prefix = NodeValue::Text(list_prefix_markdown);
if !replacements.is_empty() { if !replacements.is_empty() {
// Insert line break before next list item // Insert line break before next list item
let linebreak = NodeValue::LineBreak; let linebreak = NodeValue::LineBreak;
replacements.push(arena.alloc(AstNode::from(linebreak))); let linebreak_node = arena.alloc(create_node(linebreak));
replacements.push(linebreak_node);
}; };
replacements.push(arena.alloc(AstNode::from(list_prefix))); let list_prefix = NodeValue::Text(list_prefix_markdown);
let list_prefix_node = arena.alloc(create_node(list_prefix));
replacements.push(list_prefix_node);
for content_node in contents { for content_node in contents {
replacements.push(content_node); replacements.push(content_node);
}; };
@ -194,8 +206,7 @@ pub fn markdown_lite_to_html(text: &str) -> Result<String, MarkdownError> {
for child_node in replacements { for child_node in replacements {
node.append(child_node); node.append(child_node);
}; };
let mut borrowed_node = node.data.borrow_mut(); replace_node_value(node, NodeValue::Paragraph);
*borrowed_node = Ast::new(NodeValue::Paragraph);
}, },
NodeValue::Link(_) => fix_microsyntaxes(node)?, NodeValue::Link(_) => fix_microsyntaxes(node)?,
_ => (), _ => (),
@ -236,8 +247,10 @@ pub fn markdown_basic_to_html(text: &str) -> Result<String, MarkdownError> {
if let Some(last_child) = node.last_child() { if let Some(last_child) = node.last_child() {
let last_child_value = &last_child.data.borrow().value; let last_child_value = &last_child.data.borrow().value;
if !matches!(last_child_value, NodeValue::LineBreak) { if !matches!(last_child_value, NodeValue::LineBreak) {
let line_break = AstNode::from(NodeValue::LineBreak); let line_break = NodeValue::LineBreak;
node.append(arena.alloc(line_break)); let line_break_node =
arena.alloc(create_node(line_break));
node.append(line_break_node);
}; };
}; };
}; };