diff --git a/pagetop/src/base/theme/aliner.rs b/pagetop/src/base/theme/aliner.rs index e9ef98b3..192c9026 100644 --- a/pagetop/src/base/theme/aliner.rs +++ b/pagetop/src/base/theme/aliner.rs @@ -12,7 +12,7 @@ impl ThemeTrait for Aliner { } fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { - configure_service_for_static_files!(cfg, "/aliner", bundle_aliner); + serve_static_files!(cfg, "/aliner", bundle_aliner); } fn before_render_page(&self, page: &mut Page) { diff --git a/pagetop/src/base/theme/bootsier.rs b/pagetop/src/base/theme/bootsier.rs index 36ca54e9..7a0ab305 100644 --- a/pagetop/src/base/theme/bootsier.rs +++ b/pagetop/src/base/theme/bootsier.rs @@ -14,7 +14,7 @@ impl ThemeTrait for Bootsier { } fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { - configure_service_for_static_files!(cfg, "/bootsier", bundle_bootsier); + serve_static_files!(cfg, "/bootsier", bundle_bootsier); } fn before_render_page(&self, page: &mut Page) { diff --git a/pagetop/src/base/theme/bulmix.rs b/pagetop/src/base/theme/bulmix.rs index cef1d6a9..d1026840 100644 --- a/pagetop/src/base/theme/bulmix.rs +++ b/pagetop/src/base/theme/bulmix.rs @@ -12,7 +12,7 @@ impl ThemeTrait for Bulmix { } fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { - configure_service_for_static_files!(cfg, "/bulmix", bundle_bulmix); + serve_static_files!(cfg, "/bulmix", bundle_bulmix); } fn before_render_page(&self, page: &mut Page) { diff --git a/pagetop/src/core/theme/all.rs b/pagetop/src/core/theme/all.rs index ca75e785..5da50c59 100644 --- a/pagetop/src/core/theme/all.rs +++ b/pagetop/src/core/theme/all.rs @@ -1,5 +1,5 @@ use super::ThemeStaticRef; -use crate::{base, configure_service_for_static_files, server, trace, LazyStatic}; +use crate::{base, serve_static_files, server, trace, LazyStatic}; use std::sync::RwLock; @@ -41,7 +41,7 @@ pub fn theme_by_single_name(single_name: &str) -> Option { } pub fn configure_services(cfg: &mut server::web::ServiceConfig) { - configure_service_for_static_files!(cfg, "/theme", bundle_theme); + serve_static_files!(cfg, "/theme", bundle_theme); for t in THEMES.read().unwrap().iter() { t.configure_service(cfg); diff --git a/pagetop/src/prelude.rs b/pagetop/src/prelude.rs index 1c976151..e2d66bc8 100644 --- a/pagetop/src/prelude.rs +++ b/pagetop/src/prelude.rs @@ -2,7 +2,7 @@ pub use crate::{concat_string, LazyStatic, ResultExt}; // Macros. -pub use crate::{args, configure_service_for_static_files, pub_config, pub_handle, pub_locale}; +pub use crate::{args, pub_config, pub_handle, pub_locale, serve_static_files}; // Helpers. pub use crate::util; diff --git a/pagetop/src/util.rs b/pagetop/src/util.rs index 2088dc24..c743cf5d 100644 --- a/pagetop/src/util.rs +++ b/pagetop/src/util.rs @@ -115,7 +115,7 @@ macro_rules! args { } #[macro_export] -macro_rules! configure_service_for_static_files { +macro_rules! serve_static_files { ( $cfg:ident, $dir:expr, $embed:ident ) => {{ let static_files = &$crate::config::SETTINGS.dev.static_files; if static_files.is_empty() {