implement transclusion (#61)

* implement transclusion * fix regex * update regex --------- Co-authored-by: Ben Stern <[email protected]>
AustinWise · Mar 11, 2024 · 8a99558 · 8a99558
1 parent 7f6a1b8
commit 8a99558
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,6 +27,7 @@ once_cell = "1.18.0"
 pretty_env_logger = "0.5"
 pulldown-cmark = { version = "0.9", default-features = false }
 rand = "0.8.5"
+regex = { version = "1.10.3", features = ["std"] }
 rocket = "0.5.0"
 serde = { version = "1.0", features = ["derive"] }
 strum = "0.25"

diff --git a/src/wiki.rs b/src/wiki.rs
@@ -1,5 +1,10 @@
+use std::str;
 use std::sync::Arc;
 
+use lazy_static::lazy_static;
+
+use regex::bytes::{Captures, Regex};
+
 use tantivy::collector::TopDocs;
 use tantivy::query::QueryParser;
 use tantivy::schema::*;
@@ -210,7 +215,23 @@ impl Wiki {
     }
 
     pub fn read_file(&self, file_path: &[&str]) -> Result<Vec<u8>, MyError> {
-        self.0.repository.read_file(file_path)
+        lazy_static! {
+            static ref RE: Regex = Regex::new(r"^{{(.+?)}}$").unwrap();
+        }
+        let mut res = self.0.repository.read_file(file_path);
+        if let Ok(mut bytes) = res {
+            while RE.is_match(&bytes) {
+                bytes = RE.replace(&bytes, |caps: &Captures| {
+                    if let Ok(filename) = str::from_utf8(&caps[1]) {
+                        self.0.repository.read_file(&[filename]).unwrap_or(b"**read error**".to_vec())
+                    } else {
+                        b"**conversion error**".to_vec()
+                    }
+                }).to_vec();
+            }
+            res = Ok(bytes)
+        }
+        res
     }
 
     pub fn write_file(