diff --git a/src/app/slant.flf b/assets/figfonts/slant.flf similarity index 100% rename from src/app/slant.flf rename to assets/figfonts/slant.flf diff --git a/src/app/small.flf b/assets/figfonts/small.flf similarity index 100% rename from src/app/small.flf rename to assets/figfonts/small.flf diff --git a/src/app/speed.flf b/assets/figfonts/speed.flf similarity index 100% rename from src/app/speed.flf rename to assets/figfonts/speed.flf diff --git a/config/reference.toml b/config/reference.toml index 189ebf6b..83c2b9ff 100644 --- a/config/reference.toml +++ b/config/reference.toml @@ -80,8 +80,8 @@ admin_path = "/admin" # Ruta raíz del panel de administración # "/", sin "/" final; cada tramo sólo admite letras y dígitos # ASCII, "-", "_", "." y "~" (sin ser "." ni ".."). Una no # válida impide arrancar. -startup_banner = "Slant" # Banner ASCII al arrancar: "Off", "Slant", "Small", "Speed" - # o "Starwars". +startup_banner = true # Muestra al arrancar un banner ASCII con el nombre de la + # aplicación (true) o no (false). [dev] pagetop_static_dir = "" # Directorio static/ de PageTop para servir sus archivos diff --git a/src/app.rs b/src/app.rs index 1dd9eeda..ef9d51a5 100644 --- a/src/app.rs +++ b/src/app.rs @@ -1,7 +1,5 @@ //! Prepara y ejecuta una aplicación creada con PageTop. -mod figfont; - use crate::admin; use crate::core::extension; use crate::core::extension::ExtensionRef; @@ -16,6 +14,7 @@ use crate::{PAGETOP_VERSION, global, trace}; use axum::extract::DefaultBodyLimit; use axum::middleware::Next; +use figlet_rs::FIGlet; use tower::{Layer, ServiceExt}; use tower_http::catch_panic::CatchPanicLayer; use tracing_appender::non_blocking::WorkerGuard; @@ -146,7 +145,7 @@ impl Application { use colored::Colorize; use terminal_size::{Width, terminal_size}; - if global::SETTINGS.app.startup_banner != global::StartupBanner::Off { + if global::SETTINGS.app.startup_banner { // Nombre de la aplicación, ajustado al ancho del terminal si es necesario. let mut app_ff = String::new(); let app_name = &global::SETTINGS.app.name; @@ -158,7 +157,10 @@ impl Application { if app_name.chars().count() > maxlen { app = format!("{app}..."); } - if let Some(ff) = figfont::FIGFONT.convert(&app) { + // Esta fuente incluye la `ñ` y las vocales con tilde. + if let Ok(font) = FIGlet::from_content(include_str!("../assets/figfonts/slant.flf")) + && let Some(ff) = font.convert(&app) + { app_ff = ff.to_string(); } } diff --git a/src/app/figfont.rs b/src/app/figfont.rs deleted file mode 100644 index 765ef265..00000000 --- a/src/app/figfont.rs +++ /dev/null @@ -1,20 +0,0 @@ -use crate::global; - -use std::sync::LazyLock; - -use figlet_rs::FIGlet; - -pub static FIGFONT: LazyLock = LazyLock::new(|| { - let slant = include_str!("slant.flf"); - let small = include_str!("small.flf"); - let speed = include_str!("speed.flf"); - let starwars = include_str!("starwars.flf"); - - FIGlet::from_content(match global::SETTINGS.app.startup_banner { - global::StartupBanner::Off | global::StartupBanner::Slant => slant, - global::StartupBanner::Small => small, - global::StartupBanner::Speed => speed, - global::StartupBanner::Starwars => starwars, - }) - .unwrap() -}); diff --git a/src/app/starwars.flf b/src/app/starwars.flf deleted file mode 100644 index 6ea55f02..00000000 --- a/src/app/starwars.flf +++ /dev/null @@ -1,719 +0,0 @@ -flf2a$ 7 6 22 15 4 -starwars.flf by Ryan Youck (youck@cs.uregina.ca) Dec 25/1994 -I am not responsible for use of this font -Based on Big.flf by Glenn Chappell - -$ $@ -$ $@ -$ $@ -$ $@ -$ $@ -$ $@ -$ $@@ - __ $@ -| |$@ -| |$@ -| |$@ -|__|$@ -(__)$@ - $@@ - _ _ @ -( | )@ - V V @ - $ @ - $ @ - $ @ - @@ - _ _ @ - _| || |_$@ -|_ __ _|@ - _| || |_ @ -|_ __ _|@ - |_||_| $@ - @@ - __,--,_.@ - / |@ - | (----`@ - \ \ $@ -.----) | $@ -|_ __/ $@ - '--' $@@ - _ ___$ @ - / \ / /$ @ -( o ) / / $ @ - \_/ / / _$ @ - / / / \ @ - / / ( o )@ - /__/ \_/ @@ - @ - ___ @ - ( _ ) $@ - / _ \/\@ -| (_> <@ - \___/\/@ - $@@ - __ @ -(_ )@ - |/ @ - $ @ - $ @ - $ @ - @@ - ___@ - / /@ -| |$@ -| |$@ -| |$@ -| |$@ - \__\@@ -___ @ -\ \ @ - | |@ - | |@ - | |@ - | |@ -/__/ @@ - _ @ - /\| |/\ @ - \ ` ' /$@ -|_ _|@ - / , . \$@ - \/|_|\/ @ - @@ - @ - _ @ - _| |_$@ -|_ _|@ - |_| $@ - $ @ - @@ - @ - @ - $ @ - $ @ - __ @ -(_ )@ - |/ @@ - @ - @ - ______ @ -|______|@ - $ @ - $ @ - @@ - @ - @ - @ - $ @ - __ @ -(__)@ - @@ - ___@ - / /@ - / / @ - / /$ @ - / /$ @ -/__/$ @ - @@ - ___ $@ - / _ \ $@ -| | | |$@ -| | | |$@ -| |_| |$@ - \___/ $@ - $@@ - __ $@ -/_ |$@ - | |$@ - | |$@ - | |$@ - |_|$@ - $@@ - ___ $@ -|__ \ $@ - $) |$@ - / / $@ - / /_ $@ -|____|$@ - $@@ - ____ $@ -|___ \ $@ - __) |$@ - |__ < $@ - ___) |$@ -|____/ $@ - $@@ - _ _ $@ -| || | $@ -| || |_ $@ -|__ _|$@ - | | $@ - |_| $@ - $@@ - _____ $@ -| ____|$@ -| |__ $@ -|___ \ $@ - ___) |$@ -|____/ $@ - $@@ - __ $@ - / / $@ - / /_ $@ -| '_ \ $@ -| (_) |$@ - \___/ $@ - $@@ - ______ $@ -|____ |$@ - $/ / $@ - / / $@ - / / $@ - /_/ $@ - $@@ - ___ $@ - / _ \ $@ -| (_) |$@ - > _ < $@ -| (_) |$@ - \___/ $@ - $@@ - ___ $@ - / _ \ $@ -| (_) |$@ - \__, |$@ - / / $@ - /_/ $@ - $@@ - @ - _ @ -(_)@ - $ @ - _ @ -(_)@ - @@ - @ - _ @ -(_)@ - $ @ - _ @ -( )@ -|/ @@ - ___@ - / /@ - / /$@ -< <$ @ - \ \$@ - \__\@ - @@ - @ - ______ @ -|______|@ - ______ @ -|______|@ - @ - @@ -___ @ -\ \$ @ - \ \ @ - > >@ - / / @ -/__/$ @ - @@ - ______ $@ -| \ $@ -`----) |$@ - / / $@ - |__| $@ - __ $@ - (__) $@@ - ____ @ - / __ \ @ - / / _` |@ -| | (_| |@ - \ \__,_|@ - \____/ @ - @@ - ___ $ @ - / \ $ @ - / ^ \$ @ - / /_\ \$ @ - / _____ \$ @ -/__/ \__\$@ - $@@ -.______ $@ -| _ \ $@ -| |_) |$@ -| _ < $@ -| |_) |$@ -|______/ $@ - $@@ - ______$@ - / |@ -| ,----'@ -| | $@ -| `----.@ - \______|@ - $@@ - _______ $@ -| \$@ -| .--. |@ -| | | |@ -| '--' |@ -|_______/$@ - $@@ - _______ @ -| ____|@ -| |__ $@ -| __| $@ -| |____ @ -|_______|@ - @@ - _______ @ -| ____|@ -| |__ $@ -| __| $@ -| | $ @ -|__| @ - @@ - _______ @ - / _____|@ -| | __ $@ -| | |_ |$@ -| |__| |$@ - \______|$@ - $@@ - __ __ $@ -| | | |$@ -| |__| |$@ -| __ |$@ -| | | |$@ -|__| |__|$@ - $@@ - __ $@ -| |$@ -| |$@ -| |$@ -| |$@ -|__|$@ - $@@ - __ $@ - | |$@ - | |$@ -.--. | |$@ -| `--' |$@ - \______/ $@ - $@@ - __ ___$@ -| |/ /$@ -| ' / $@ -| < $@ -| . \ $@ -|__|\__\$@ - $@@ - __ $@ -| | $@ -| | $@ -| | $@ -| `----.@ -|_______|@ - $@@ -.___ ___.$@ -| \/ |$@ -| \ / |$@ -| |\/| |$@ -| | | |$@ -|__| |__|$@ - $@@ -.__ __.$@ -| \ | |$@ -| \| |$@ -| . ` |$@ -| |\ |$@ -|__| \__|$@ - $@@ - ______ $@ - / __ \ $@ -| | | |$@ -| | | |$@ -| `--' |$@ - \______/ $@ - $@@ -.______ $@ -| _ \ $@ -| |_) |$@ -| ___/ $@ -| | $ @ -| _| $ @ - $ @@ - ______ $ @ - / __ \ $ @ -| | | | $ @ -| | | | $ @ -| `--' '--. @ - \_____\_____\@ - $ @@ -.______ $ @ -| _ \ $ @ -| |_) | $ @ -| / $ @ -| |\ \----.@ -| _| `._____|@ - $@@ - _______.@ - / |@ - | (----`@ - \ \ $@ -.----) | $@ -|_______/ $@ - $@@ -.___________.@ -| |@ -`---| |----`@ - | | $ @ - | | $ @ - |__| $ @ - $ @@ - __ __ $@ -| | | |$@ -| | | |$@ -| | | |$@ -| `--' |$@ - \______/ $@ - $@@ -____ ____$@ -\ \ / /$@ - \ \/ /$ @ - \ /$ @ - \ /$ @ - \__/$ @ - $ @@ -____ __ ____$@ -\ \ / \ / /$@ - \ \/ \/ /$ @ - \ /$ @ - \ /\ /$ @ - \__/ \__/$ @ - $ @@ -___ ___$@ -\ \ / /$@ - \ V / $@ - > < $@ - / . \ $@ -/__/ \__\$@ - $@@ -____ ____$@ -\ \ / /$@ - \ \/ /$ @ - \_ _/$ @ - | |$ @ - |__|$ @ - $ @@ - ________ $@ -| / $@ -`---/ / $@ - / / $@ - / /----.@ - /________|@ - $@@ - ____ @ -| |@ -| |-`@ -| | $@ -| | $@ -| |-.@ -|____|@@ -___ @ -\ \ $ @ - \ \$ @ - \ \$ @ - \ \$@ - \__\@ - @@ - ____ @ -| |@ -`-| |@ - | |@ - | |@ -.-| |@ -|____|@@ - ___ @ - / \ @ -/--^--\@ - $@ - $@ - $@ - $@@ - @ - @ - @ - $ @ - $ @ - ______ @ -|______|@@ - __ @ -( _)@ - \| @ - $ @ - $ @ - $ @ - @@ - ___ $ @ - / \ $ @ - / ^ \$ @ - / /_\ \$ @ - / _____ \$ @ -/__/ \__\$@ - $@@ -.______ $@ -| _ \ $@ -| |_) |$@ -| _ < $@ -| |_) |$@ -|______/ $@ - $@@ - ______$@ - / |@ -| ,----'@ -| | $@ -| `----.@ - \______|@ - $@@ - _______ $@ -| \$@ -| .--. |@ -| | | |@ -| '--' |@ -|_______/$@ - $@@ - _______ @ -| ____|@ -| |__ $@ -| __| $@ -| |____ @ -|_______|@ - @@ - _______ @ -| ____|@ -| |__ $@ -| __| $@ -| | $ @ -|__| @ - @@ - _______ @ - / _____|@ -| | __ $@ -| | |_ |$@ -| |__| |$@ - \______|$@ - $@@ - __ __ $@ -| | | |$@ -| |__| |$@ -| __ |$@ -| | | |$@ -|__| |__|$@ - $@@ - __ $@ -| |$@ -| |$@ -| |$@ -| |$@ -|__|$@ - $@@ - __ $@ - | |$@ - | |$@ -.--. | |$@ -| `--' |$@ - \______/ $@ - $@@ - __ ___$@ -| |/ /$@ -| ' / $@ -| < $@ -| . \ $@ -|__|\__\$@ - $@@ - __ $@ -| | $@ -| | $@ -| | $@ -| `----.@ -|_______|@ - $@@ -.___ ___.$@ -| \/ |$@ -| \ / |$@ -| |\/| |$@ -| | | |$@ -|__| |__|$@ - $@@ -.__ __.$@ -| \ | |$@ -| \| |$@ -| . ` |$@ -| |\ |$@ -|__| \__|$@ - $@@ - ______ $@ - / __ \ $@ -| | | |$@ -| | | |$@ -| `--' |$@ - \______/ $@ - $@@ -.______ $@ -| _ \ $@ -| |_) |$@ -| ___/ $@ -| | $ @ -| _| $ @ - $ @@ - ______ $ @ - / __ \ $ @ -| | | | $ @ -| | | | $ @ -| `--' '--. @ - \_____\_____\@ - $ @@ -.______ $ @ -| _ \ $ @ -| |_) | $ @ -| / $ @ -| |\ \----.@ -| _| `._____|@ - $@@ - _______.@ - / |@ - | (----`@ - \ \ $@ -.----) | $@ -|_______/ $@ - $@@ -.___________.@ -| |@ -`---| |----`@ - | | $ @ - | | $ @ - |__| $ @ - $ @@ - __ __ $@ -| | | |$@ -| | | |$@ -| | | |$@ -| `--' |$@ - \______/ $@ - $@@ -____ ____$@ -\ \ / /$@ - \ \/ /$ @ - \ /$ @ - \ /$ @ - \__/$ @ - $ @@ -____ __ ____$@ -\ \ / \ / /$@ - \ \/ \/ /$ @ - \ /$ @ - \ /\ /$ @ - \__/ \__/$ @ - $ @@ -___ ___$@ -\ \ / /$@ - \ V / $@ - > < $@ - / . \ $@ -/__/ \__\$@ - $@@ -____ ____$@ -\ \ / /$@ - \ \/ /$ @ - \_ _/$ @ - | |$ @ - |__|$ @ - $ @@ - ________ $@ -| / $@ -`---/ / $@ - / / $@ - / /----.@ - /________|@ - $@@ - ___@ - / /@ - | |$@ -/ /$ @ -\ \$ @ - | |$@ - \__\@@ - __ $@ -| |$@ -| |$@ -| |$@ -| |$@ -| |$@ -|__|$@@ -___ @ -\ \$ @ - | | @ - \ \@ - / /@ - | | @ -/__/$ @@ - __ _ @ - / \/ |@ -|_/\__/ @ - $ @ - $ @ - $ @ - @@ - _ _ @ - (_)_(_) @ - / \ @ - / _ \ @ - / ___ \ @ -/_/ \_\@ - @@ - _ _ @ -(_)_(_)@ - / _ \ @ -| | | |@ -| |_| |@ - \___/ @ - @@ - _ _ @ -(_) (_)@ -| | | |@ -| | | |@ -| |_| |@ - \___/ @ - @@ - _ _ @ -(_) (_)@ - __ _ @ - / _` |@ -| (_| |@ - \__,_|@ - @@ - _ _ @ -(_) (_)@ - ___ @ - / _ \ @ -| (_) |@ - \___/ @ - @@ - _ _ @ -(_) (_)@ - _ _ @ -| | | |@ -| |_| |@ - \__,_|@ - @@ - ___ @ - / _ \ @ -| | ) |@ -| |< < @ -| | ) |@ -| ||_/ @ -|_| @@ diff --git a/src/global.rs b/src/global.rs index f89a83d3..d4a97dd6 100644 --- a/src/global.rs +++ b/src/global.rs @@ -12,9 +12,6 @@ use std::sync::LazyLock; mod lang_negotiation; pub use lang_negotiation::LangNegotiation; -mod startup_banner; -pub use startup_banner::StartupBanner; - mod timezone_order; pub use timezone_order::TimezoneOrder; @@ -178,10 +175,9 @@ pub struct AppSettings { #[default = "/admin"] #[serde(deserialize_with = "admin_path")] pub admin_path: String, - /// Banner ASCII mostrado al inicio: *"Off"* (desactivado), *"Slant"*, *"Small"*, *"Speed"* o - /// *"Starwars"*. - #[default(StartupBanner::Slant)] - pub startup_banner: StartupBanner, + /// Muestra al iniciar un *banner* ASCII con el nombre de la aplicación (*true*) o no (*false*). + #[default = true] + pub startup_banner: bool, /// Modo de ejecución, dado por la variable de entorno `PAGETOP_RUN_MODE`, o *"default"* si no /// está definida o está vacía. Con la *feature* `testing` activa es siempre *"test"*. pub run_mode: String, diff --git a/src/global/startup_banner.rs b/src/global/startup_banner.rs deleted file mode 100644 index a30ef239..00000000 --- a/src/global/startup_banner.rs +++ /dev/null @@ -1,45 +0,0 @@ -use crate::AutoDefault; - -use serde::de::Error; -use serde::{Deserialize, Deserializer}; - -/// Opciones para el *banner* ASCII mostrado al arrancar la aplicación. -/// -/// Se obtiene de [`global::SETTINGS.app.startup_banner`] y controla si se muestra un *banner* en la -/// salida estándar al arrancar la aplicación. -/// -/// [`global::SETTINGS.app.startup_banner`]: crate::global::AppSettings::startup_banner -#[derive(AutoDefault, Clone, Copy, Debug, Eq, PartialEq)] -pub enum StartupBanner { - /// No muestra ningún banner de inicio. - Off, - /// Banner en estilo "Slant". Es el comportamiento por defecto. - #[default] - Slant, - /// Banner en estilo "Small". - Small, - /// Banner en estilo "Speed". - Speed, - /// Banner en estilo "Starwars". - Starwars, -} - -impl<'de> Deserialize<'de> for StartupBanner { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - let raw = String::deserialize(deserializer)?; - match raw.trim().to_ascii_lowercase().as_str() { - "off" => Ok(Self::Off), - "slant" => Ok(Self::Slant), - "small" => Ok(Self::Small), - "speed" => Ok(Self::Speed), - "starwars" => Ok(Self::Starwars), - _ => Err(D::Error::unknown_variant( - &raw, - &["Off", "Slant", "Small", "Speed", "Starwars"], - )), - } - } -}