From 92687016ed433b7bd8ba546fba8bfe2315b54829 Mon Sep 17 00:00:00 2001 From: zyl Date: Thu, 7 Nov 2024 16:44:35 -0800 Subject: [PATCH] remove obsolete `template_index` --- src/lib.rs | 21 --------------------- src/serving.rs | 4 +--- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index caa00ef..99caf00 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,7 +18,6 @@ use rayon::prelude::*; use resource::{EmbedMetadata, ResourceBuilderConfig}; use serde::Deserialize; use url::Url; -use util::get_name; use walkdir::WalkDir; use builder::SiteBuilder; @@ -103,8 +102,6 @@ pub struct Site { pub site_path: PathBuf, /// The site's configuration. pub config: SiteConfig, - /// An index of available templates. - pub template_index: HashMap, /// An index of available pages. pub page_index: HashMap, } @@ -118,23 +115,6 @@ impl Site { ) .wrap_err("Failed to parse site config")?; - let mut template_index = HashMap::new(); - let templates_path = site_path.join(TEMPLATES_PATH); - for entry in WalkDir::new(&templates_path).into_iter() { - let entry = entry.wrap_err("Failed to read template entry")?; - let path = entry.path(); - - if let Some(ext) = path.extension() { - if ext == "hbs" && entry.file_type().is_file() { - let (_, name) = get_name( - path.strip_prefix(&templates_path) - .wrap_err("This really shouldn't have happened")?, - ); - template_index.insert(name, path.to_owned()); - } - } - } - let mut page_index = HashMap::new(); let pages_path = site_path.join(PAGES_PATH); for entry in WalkDir::new(&pages_path).into_iter() { @@ -158,7 +138,6 @@ impl Site { Ok(Self { site_path: site_path.to_owned(), config, - template_index, page_index, }) } diff --git a/src/serving.rs b/src/serving.rs index 1dfd3b7..2376a90 100644 --- a/src/serving.rs +++ b/src/serving.rs @@ -114,9 +114,7 @@ fn remove(builder: &mut SiteBuilder, path: &Path, relative_path: &Path) -> eyre: builder.site.page_index.remove(&page_name_str); std::fs::remove_file(builder.build_path.join(page_name.with_extension("html"))) .with_context(|| format!("Failed to remove page at {:?}", path))?; - } else if let Ok(template_path) = relative_path.strip_prefix(TEMPLATES_PATH) { - let (_template_name, template_name_str) = get_name(template_path); - builder.site.template_index.remove(&template_name_str); + } else if let Ok(_template_path) = relative_path.strip_prefix(TEMPLATES_PATH) { builder.tera.full_reload()?; builder .site