From 79999cecedd84e99655fbcdba0bd4e715a22173f Mon Sep 17 00:00:00 2001 From: alyx Date: Fri, 5 Apr 2024 17:27:46 -0400 Subject: Lua support feature-complete Full implementation of debug mode still pending --- src/theming.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/theming.rs') diff --git a/src/theming.rs b/src/theming.rs index d8525f9..1d7b1f2 100644 --- a/src/theming.rs +++ b/src/theming.rs @@ -12,10 +12,12 @@ pub fn render_theme(name: Option<&str>, ctx: &crate::ctx::Ctx) -> (String, Resul if let Some(name) = name { theme = name; - res = hbs::render_theme(name, ctx) + res = lua::render_theme(name, ctx) + .or_else(|| hbs::render_theme(name, ctx)) } - res = res.or_else(|| { log::debug!("Falling back to default theme!"); theme = &CONFIG.default_theme; None }) + res = res.or_else(|| { log::debug!("Falling back to default theme from requested theme `{theme}`!"); theme = &CONFIG.default_theme; None }) + .or_else(|| lua::render_theme(theme, ctx)) .or_else(|| hbs::render_theme(theme, ctx)); let res = res.unwrap_or_else(|| { log::error!("Couldn't load requested theme or default theme `{}`!", CONFIG.default_theme); Err(StatusCode::INTERNAL_SERVER_ERROR)}); -- cgit v1.2.3-54-g00ecf