1 files changed, 13 insertions, 32 deletions

diff --git a/src/config.rs b/src/config.rs
index b242534..d3e2b8a 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -4,25 +4,24 @@ use std::sync::Arc;
 use std::time::*;
 
 use dotenv::var;
-use handlebars::{Handlebars, handlebars_helper};
 use duration_str as ds;
 
-static INTERNAL_THEMES: &[(&str, &str)] = &[("plain", include_str!("themes/plain.hbs"))];
-
 pub static CONFIG: LazyLock<Arc<Config>> = LazyLock::new(|| {
   Config::new()
 });
 
 #[derive(Debug)]
 pub struct Config {
+  pub(crate) google_api_key: Option<Arc<str>>,
   pub(crate) lastfm_api_key: Arc<str>,
+
   port: u16,
-  default_theme: Arc<str>,
   send_refresh_header: bool,
 
-  handlebars: Handlebars<'static>,
-
-  pub(crate )google_api_key: Option<Arc<str>>,
+  pub(crate) default_theme: Arc<str>,
+  pub(crate) theme_dir: Option<Arc<str>>,
+  pub(crate) theme_ext: Arc<str>,
+  pub(crate) theme_debug: bool,
 
   pub(crate) whitelist: BTreeSet<String>,
   pub(crate) whitelist_mode: String,
@@ -37,31 +36,15 @@ impl Config {
     let whitelist_refresh = duration_from_var("LFME_WHITELIST_REFRESH", 60);
     Arc::new(Config {
       lastfm_api_key: var("LFME_LASTFM_API_KEY").expect("last.fm API key must be set").into(),
+      google_api_key: var("LFME_GOOGLE_API_KEY").map(Into::into).ok(),
+
       port: var("LFME_PORT").map(|p| p.parse().expect("cannot parse as a port number")).unwrap_or(9999),
-      default_theme: var("LFME_THEME_DEFAULT").map(Into::into).unwrap_or_else(|_| "plain".into()),
       send_refresh_header: !var("LFME_NO_REFRESH").map(|h| &h == "1").unwrap_or(false),
 
-      handlebars: {
-        let mut hb = Handlebars::new();
-        handlebars_helper!(url_encode: |s: String| urlencoding::encode(&s));
-
-        hb.register_helper("url-encode", Box::new(url_encode));
-
-        for (key, fulltext) in INTERNAL_THEMES {
-          log::info!(target: "lfm::config::theme", "Registering internal theme `{key}`");
-          hb.register_template_string(key, fulltext).unwrap();
-        }
-        hb.set_dev_mode(var("LFME_THEME_DEV").map(|h| &h == "1").unwrap_or(false));
-
-        if let Ok(themes_dir) = var("LFME_THEME_DIR") {
-          log::info!(target: "lfm::config::theme", "Registering theme dir `{themes_dir}`");
-          hb.register_templates_directory(&var("LFME_THEME_EXT").unwrap_or_else(|_| ".hbs".into()), themes_dir).unwrap();
-        }
-
-        hb
-      },
-
-      google_api_key: var("LFME_GOOGLE_API_KEY").map(Into::into).ok(),
+      default_theme: var("LFME_THEME_DEFAULT").map(Into::into).unwrap_or_else(|_| "plain".into()),
+      theme_dir: var("LFME_THEME_DIR").ok().map(Into::into),
+      theme_ext: var("LFME_THEME_EXT").unwrap_or_else(|_| ".hbs".into()).into(),
+      theme_debug: var("LFME_THEME_DEV").map(|h| &h == "1").unwrap_or(false),
 
       whitelist: var("LFME_WHITELIST").ok().map(|w| w.split(',').map(|s| s.trim().to_string()).collect()).unwrap_or_default(),
       whitelist_mode: var("LFME_WHITELIST_MODE").map(|m| m.to_ascii_lowercase()).unwrap_or_else(|_| "open".into()),
@@ -70,9 +53,7 @@ impl Config {
     })
   }
 
+  pub fn has_google_api_key(&self) -> bool { self.google_api_key.is_some() }
   pub fn port(&self) -> u16 { self.port }
   pub fn send_refresh_header(&self) -> bool { self.send_refresh_header }
-  pub fn has_google_api_key(&self) -> bool { self.google_api_key.is_some() }
-  pub fn handlebars(&self) -> &Handlebars { &self.handlebars }
-  pub fn default_theme(&self) -> Arc<str> { self.default_theme.clone() }
 }