nwtemplates: Split init_from_config and init_from_dir

otterlib is going to call init_from_dir.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/daemon/main.rs b/daemon/main.rs
index 8540b1f75951d18c482e1554a26a8b5e5e0c960a..f7ba4aafb360ed15883023e13dca86fcbc5ff32f 100644 (file)
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -498,7 +498,7 @@ async fn main() -> Result<(),StartupError> {
       .context("check bundled-sources directory")?;
   }
 
-  nwtemplates::init()?;
+  nwtemplates::init_from_config()?;
   shapelib::load_global_libs(&config().shapelibs)?;
 
   c.lock_save_area()?;

diff --git a/src/nwtemplates.rs b/src/nwtemplates.rs
index a492bddfed409c41525763d7959651a481274eec..1747957ec36c82a9bcd70ace06626b3a99c9fb2b 100644 (file)
--- a/src/nwtemplates.rs
+++ b/src/nwtemplates.rs
@@ -14,11 +14,14 @@ struct State {
 }
 
 #[throws(StartupError)]
-pub fn init() {
+pub fn init_from_config() {
+  init_from_dir(&config().nwtemplate_dir)?;
+}
+
+#[throws(StartupError)]
+pub fn init_from_dir(nwtemplate_dir: &str) {
   let mut guard = STATE.write();
   assert!(guard.is_none());
-  let config = config();
-  let nwtemplate_dir = &config.nwtemplate_dir;
   let glob = format!("{}/*.tera", nwtemplate_dir);
   let tera = Tera::new(&glob)
     .map_err(|e| anyhow!("{}", e))