diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2021-08-07 15:37:51 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2021-09-07 17:32:16 +0100 |
commit | b443c533f9e5a0bdbf8b380a8d7d59e46c28858b (patch) | |
tree | fe01f78e107ca092a3d13875ddff704c6ec2afce /src/metadata.rs | |
parent | 1afd692bacf6c95d5897d4af74f6f2d4f8b91c1f (diff) | |
download | subplot-b443c533f9e5a0bdbf8b380a8d7d59e46c28858b.tar.gz |
chore: Unwind global template name
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'src/metadata.rs')
-rw-r--r-- | src/metadata.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/metadata.rs b/src/metadata.rs index be15380..3fd2f08 100644 --- a/src/metadata.rs +++ b/src/metadata.rs @@ -1,4 +1,4 @@ -use crate::{resource, Result}; +use crate::Result; use crate::{Bindings, TemplateSpec}; use std::fmt::Debug; @@ -48,7 +48,6 @@ impl Metadata { "Loaded basic metadata" ); let (template, spec) = if let Some((template, spec)) = get_template_spec(&doc.meta)? { - resource::set_template(&template); (Some(template), Some(spec)) } else { (None, None) @@ -56,7 +55,7 @@ impl Metadata { event!(Level::TRACE, ?template, ?spec, "Loaded template spec"); let mut bindings = Bindings::new(); - get_bindings(&bindings_filenames, &mut bindings)?; + get_bindings(&bindings_filenames, &mut bindings, template.as_deref())?; event!(Level::TRACE, "Loaded all metadata successfully"); Ok(Metadata { title, @@ -294,12 +293,12 @@ mod test_join { } } -fn get_bindings<P>(filenames: &[P], bindings: &mut Bindings) -> Result<()> +fn get_bindings<P>(filenames: &[P], bindings: &mut Bindings, template: Option<&str>) -> Result<()> where P: AsRef<Path> + Debug, { for filename in filenames { - bindings.add_from_file(filename)?; + bindings.add_from_file(filename, template)?; } Ok(()) } |