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

🔒️ Acceso más restringido para archivos estáticos

Browse source
This commit is contained in:
Manuel Cillero 2023-07-06 17:45:28 +02:00
parent 8d05ec4b53
commit 2b48ea2c80
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pagetop/src/util.rs
View file

@ -95,7 +95,7 @@ macro_rules! use_locale {
use $crate::locale::*; use $crate::locale::*;
fluent_templates::static_loader! { fluent_templates::static_loader! {
pub static $LOCALES = { static $LOCALES = {
locales: "src/locale", locales: "src/locale",
$( core_locales: $core_locales, )? $( core_locales: $core_locales, )?
fallback_language: "en-US", fallback_language: "en-US",
@ -109,7 +109,7 @@ macro_rules! use_locale {
use $crate::locale::*; use $crate::locale::*;
fluent_templates::static_loader! { fluent_templates::static_loader! {
pub static $LOCALES = { static $LOCALES = {
locales: $dir_locales, locales: $dir_locales,
$( core_locales: $core_locales, )? $( core_locales: $core_locales, )?
fallback_language: "en-US", fallback_language: "en-US",
@ -124,11 +124,15 @@ macro_rules! use_locale {
#[macro_export] #[macro_export]
macro_rules! use_static { macro_rules! use_static {
( $bundle:ident ) => { ( $bundle:ident ) => {
mod static_bundle {
include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs"));
}
}; };
( $bundle:ident => $STATIC:ident ) => { ( $bundle:ident => $STATIC:ident ) => {
mod static_bundle {
include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs")); include!(concat!(env!("OUT_DIR"), "/", stringify!($bundle), ".rs"));
static $STATIC: LazyStatic<HashMapResources> = LazyStatic::new($bundle); }
static $STATIC: LazyStatic<HashMapResources> = LazyStatic::new(static_bundle::$bundle);
}; };
} }
@ -137,7 +141,10 @@ macro_rules! serve_static_files {
( $cfg:ident, $path:expr, $bundle:ident ) => {{ ( $cfg:ident, $path:expr, $bundle: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() {
$cfg.service($crate::service::ResourceFiles::new($path, $bundle())); $cfg.service($crate::service::ResourceFiles::new(
$path,
static_bundle::$bundle(),
));
} else { } else {
$cfg.service( $cfg.service(
$crate::service::ActixFiles::new( $crate::service::ActixFiles::new(