1 files changed, 28 insertions, 12 deletions

diff --git a/src/main.rs b/src/main.rs
index eef5537..27b6510 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
 use std::io::Result;
+use std::borrow::Cow;
 use std::path::PathBuf;
 use std::collections::HashMap;
 use lazy_static::lazy_static;
@@ -6,23 +7,33 @@ use regex::{Captures,Regex};
 use pandoc::{InputFormat,InputKind,OutputFormat,OutputKind,Pandoc};
 use pandoc_ast::Block;
 
-type Blocks<'a> = HashMap<&'a str,&'a str>;
+type Blocks<'a> = HashMap<String,Cow<'a,str>>;
 
-fn build(blocks: &Blocks, entry: &str) -> String {
+fn build_block(blocks: &Blocks, code: &Cow<str>) -> String {
     lazy_static! {
-        static ref RE: Regex = Regex::new(r"(?m)^([[:blank:]]*)<<([^>\s]+)>>").unwrap();
+        static ref MACRO: Regex = Regex::new(r"(?m)^([[:blank:]]*)<<([^>\s]+)>>").unwrap();
     }
-    if let Some(entry) = blocks.get(entry).clone() {
-        RE.replace_all(entry, |caps: &Captures|
+    if MACRO.is_match(&code) {
+        let code = MACRO.replace_all(&code, |caps: &Captures| {
+            let indent = caps[1].len();
             blocks.get(&caps[2])
                   .expect("Block not present")
                   .lines()
-                  .map(|l| format!("{}{}", &caps[1], l) )
+                  .map(|l| format!("{:indent$}{}", "", l) )
                   .collect::<Vec<_>>()
                   .join("\n")
-        ).to_string()
+            }
+        );
+        build_block(blocks, &code)
     } else {
-        String::from("")
+        code.to_string()
+    }
+}
+
+fn build(blocks: &Blocks, entry: &str) {
+    if let Some(code) = blocks.get(entry) {
+        let string = build_block(blocks, code);
+        println!("{}", string);
     }
 }
 
@@ -39,17 +50,22 @@ fn main() -> Result<()> {
         let mut blocks: Blocks = HashMap::new();
         pandoc.blocks.iter().for_each(|block|
             if let Block::CodeBlock(attr, code) = block {
-                dbg!(block);
+                // let _classes = &attr.1;
+                // dbg!(block);
                 if attr.0.len() > 0 {
-                    blocks.insert(&attr.0, &code);
+                    let mut key = attr.2.iter()
+                        .find_map(|(k,v)| if k == "path" { Some(v.clone()) } else { None })
+                        .unwrap_or(String::from(""));
+                    key.push_str(&attr.0);
+                    /* Insert (or replace) block of code */
+                    blocks.insert(key, Cow::from(code));
                 } else {
                     // println!("The following code has no ID:");
                     // code.lines().for_each(|l| println!("    {}", l));
                 }
             }
         );
-        let program = build(dbg!(&blocks), "main.rs");
-        //println!("{}", program);
+        build(dbg!(&blocks), "src/main.rs");
         pandoc
     }));
     pandoc.execute().unwrap();