From eecbd9ec0c2712c68d0b459e7fe5f7eb769b2d2c Mon Sep 17 00:00:00 2001 From: Federico Igne Date: Wed, 27 Apr 2022 23:32:56 +0100 Subject: refactor: better naming --- src/main.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/main.rs b/src/main.rs index 311d24e..984c48c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -84,16 +84,15 @@ fn main() -> Result<()> { pandoc.add_filter(|json| pandoc_ast::filter(json, |pandoc| { let mut blocks: Blocks = HashMap::new(); pandoc.blocks.iter().for_each(|block| - if let Block::CodeBlock(attr, code) = block { - // let _classes = &attr.1; + if let Block::CodeBlock((id,classes,attrs), code) = block { // dbg!(block); - if attr.0.len() > 0 { - let mut key = attr.2.iter() + if !id.is_empty() { + let mut key = attrs.iter() .find_map(|(k,v)| if k == "path" { Some(v.clone()) } else { None }) .unwrap_or(String::from("")); - key.push_str(&attr.0); + key.push_str(id); /* Insert (or replace) block of code. */ - if attr.1.iter().any(|c| c == "override") { + if classes.iter().any(|c| c == "override") { blocks.insert(key, Cow::from(code)); } else { blocks.entry(key) -- cgit v1.2.3