From 343a788bac5f5f60c33c9f0deb1a218a3dbcb058 Mon Sep 17 00:00:00 2001 From: trivernis Date: Fri, 12 Jan 2024 11:25:18 +0100 Subject: [PATCH] Add templating support for dir.toml --- src/repo.rs | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/src/repo.rs b/src/repo.rs index 46ef583..8505ecb 100644 --- a/src/repo.rs +++ b/src/repo.rs @@ -44,7 +44,6 @@ pub enum DirEntry { impl DirEntry { fn parse(path: PathBuf) -> Result { if path.is_dir() { - let meta_file = path.join("dir.toml"); let mut children = Vec::new(); for read_entry in fs::read_dir(&path).into_diagnostic()? { @@ -52,9 +51,14 @@ impl DirEntry { children.push(DirEntry::parse(read_entry.path())?); } + let meta_file = path.join("dir.toml"); + let meta_tmpl = path.join("dir.toml.tmpl"); if meta_file.exists() { let metadata = RootDirData::read(&meta_file)?; Ok(Self::Root(path, metadata, children)) + } else if meta_tmpl.exists() { + let metadata = RootDirData::read_template(&meta_tmpl)?; + Ok(Self::Root(path, metadata, children)) } else { Ok(Self::Dir(path, children)) } @@ -110,10 +114,12 @@ pub enum FileEntry { impl FileEntry { fn parse(path: PathBuf) -> Result { - if let Some(true) = path.extension().map(|e| e == "tmpl") { - Ok(Self::Template(path)) - } else if path.file_name().unwrap() == "dir.toml" { + let file_name = path.file_name().unwrap(); + + if file_name == "dir.toml" || file_name == "dir.toml.tmpl" { Ok(Self::Metadata) + } else if let Some(true) = path.extension().map(|e| e == "tmpl") { + Ok(Self::Template(path)) } else { Ok(Self::Plain(path)) } @@ -164,4 +170,17 @@ impl RootDirData { .into_diagnostic() .with_context(|| format!("parsing metadata file {path:?}")) } + + fn read_template(path: &Path) -> Result { + let contents = fs::read_to_string(path) + .into_diagnostic() + .with_context(|| format!("reading metadata file {path:?}"))?; + let rendered = templating::engine() + .render_template(&contents, templating::context()) + .into_diagnostic() + .with_context(|| format!("processing template {path:?}"))?; + toml::from_str(&rendered) + .into_diagnostic() + .with_context(|| format!("parsing metadata file {path:?}")) + } }