manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

💥 Renombra configure_service_for_static_files!

Browse source 
La macro se usará ahora con el nombre serve_static_files!.
This commit is contained in:
Manuel Cillero 2023-01-25 18:47:40 +01:00
parent 06276b618c
commit 065fe9eaab
6 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pagetop/src/base/theme/aliner.rs
View file

@ -12,7 +12,7 @@ impl ThemeTrait for Aliner {
} }
fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { 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) { fn before_render_page(&self, page: &mut Page) {

2
pagetop/src/base/theme/bootsier.rs
View file

@ -14,7 +14,7 @@ impl ThemeTrait for Bootsier {
} }
fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { 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) { fn before_render_page(&self, page: &mut Page) {

2
pagetop/src/base/theme/bulmix.rs
View file

@ -12,7 +12,7 @@ impl ThemeTrait for Bulmix {
} }
fn configure_service(&self, cfg: &mut server::web::ServiceConfig) { 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) { fn before_render_page(&self, page: &mut Page) {

4
pagetop/src/core/theme/all.rs
View file

@ -1,5 +1,5 @@
use super::ThemeStaticRef; 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; use std::sync::RwLock;
@ -41,7 +41,7 @@ pub fn theme_by_single_name(single_name: &str) -> Option<ThemeStaticRef> {
} }
pub fn configure_services(cfg: &mut server::web::ServiceConfig) { 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() { for t in THEMES.read().unwrap().iter() {
t.configure_service(cfg); t.configure_service(cfg);

2
pagetop/src/prelude.rs
View file

@ -2,7 +2,7 @@
pub use crate::{concat_string, LazyStatic, ResultExt}; pub use crate::{concat_string, LazyStatic, ResultExt};
// Macros. // 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. // Helpers.
pub use crate::util; pub use crate::util;

2
pagetop/src/util.rs
View file

@ -115,7 +115,7 @@ macro_rules! args {
} }
#[macro_export] #[macro_export]
macro_rules! configure_service_for_static_files { macro_rules! serve_static_files {
( $cfg:ident, $dir:expr, $embed:ident ) => {{ ( $cfg:ident, $dir:expr, $embed:ident ) => {{
let static_files = &$crate::config::SETTINGS.dev.static_files; let static_files = &$crate::config::SETTINGS.dev.static_files;
if static_files.is_empty() { if static_files.is_empty() {