From 06276b618c32eb013a5d44bad74e70b2adca114a Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Mon, 23 Jan 2023 21:09:36 +0100 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20El=20r=C3=B3tulo=20de=20in?= =?UTF-8?q?icio=20pasa=20a=20ser=20una=20utilidad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La función para la presentación del nombre del proyecto en forma de rótulo ASCII pasa a las utilidades fuera de la API de PageTop. --- pagetop/src/app.rs | 5 ++- pagetop/src/base.rs | 2 -- pagetop/src/base/banner.rs | 33 ------------------- pagetop/src/util.rs | 33 +++++++++++++++++++ pagetop/src/{base/banner => util}/figfont.rs | 0 pagetop/src/{base/banner => util}/slant.flf | 0 pagetop/src/{base/banner => util}/small.flf | 0 pagetop/src/{base/banner => util}/speed.flf | 0 .../src/{base/banner => util}/starwars.flf | 0 9 files changed, 35 insertions(+), 38 deletions(-) delete mode 100644 pagetop/src/base/banner.rs rename pagetop/src/{base/banner => util}/figfont.rs (100%) rename pagetop/src/{base/banner => util}/slant.flf (100%) rename pagetop/src/{base/banner => util}/small.flf (100%) rename pagetop/src/{base/banner => util}/speed.flf (100%) rename pagetop/src/{base/banner => util}/starwars.flf (100%) diff --git a/pagetop/src/app.rs b/pagetop/src/app.rs index 8e856131..39f6f3dc 100644 --- a/pagetop/src/app.rs +++ b/pagetop/src/app.rs @@ -1,10 +1,9 @@ -use crate::base::banner; use crate::core::module::ModuleStaticRef; use crate::core::{module, theme}; use crate::html::Markup; use crate::response::page::ResultPage; use crate::response::FatalError; -use crate::{config, locale, server, trace, LazyStatic}; +use crate::{config, locale, server, trace, util, LazyStatic}; #[cfg(feature = "database")] use crate::db; @@ -20,7 +19,7 @@ pub struct Application { impl Application { pub fn prepare(app: ModuleStaticRef) -> Result { // Rótulo de presentación. - banner::print_on_startup(); + util::print_on_startup(); // Inicia registro de trazas y eventos. LazyStatic::force(&trace::TRACING); diff --git a/pagetop/src/base.rs b/pagetop/src/base.rs index 4fba6995..d58aa565 100644 --- a/pagetop/src/base.rs +++ b/pagetop/src/base.rs @@ -1,5 +1,3 @@ -pub(crate) mod banner; - pub mod component; pub mod module; pub mod theme; diff --git a/pagetop/src/base/banner.rs b/pagetop/src/base/banner.rs deleted file mode 100644 index aa36fb70..00000000 --- a/pagetop/src/base/banner.rs +++ /dev/null @@ -1,33 +0,0 @@ -mod figfont; -use figfont::FIGFONT; - -use crate::config; - -use substring::Substring; - -pub fn print_on_startup() { - if config::SETTINGS.app.startup_banner.to_lowercase() != "off" { - if let Some((term_width, _)) = term_size::dimensions() { - if term_width >= 80 { - let maxlen = (term_width / 10) - 2; - let mut app = config::SETTINGS.app.name.substring(0, maxlen).to_owned(); - if config::SETTINGS.app.name.len() > maxlen { - app = format!("{}...", app); - } - println!( - "\n{} {}\n\n Powered by PageTop {}\n", - FIGFONT.convert(&app).unwrap(), - &config::SETTINGS.app.description, - env!("CARGO_PKG_VERSION") - ); - return; - } - } - println!( - "\n{}\n{}\n\nPowered by PageTop {}\n", - &config::SETTINGS.app.name, - &config::SETTINGS.app.description, - env!("CARGO_PKG_VERSION") - ); - } -} diff --git a/pagetop/src/util.rs b/pagetop/src/util.rs index 1fe37b80..2088dc24 100644 --- a/pagetop/src/util.rs +++ b/pagetop/src/util.rs @@ -1,9 +1,42 @@ +mod figfont; + +use crate::config; + +use substring::Substring; + pub use static_files::Resource as StaticResource; pub type HashMapResources = std::collections::HashMap<&'static str, StaticResource>; pub type Handle = u64; +pub(crate) fn print_on_startup() { + if config::SETTINGS.app.startup_banner.to_lowercase() != "off" { + if let Some((term_width, _)) = term_size::dimensions() { + if term_width >= 80 { + let maxlen = (term_width / 10) - 2; + let mut app = config::SETTINGS.app.name.substring(0, maxlen).to_owned(); + if config::SETTINGS.app.name.len() > maxlen { + app = format!("{}...", app); + } + println!( + "\n{} {}\n\n Powered by PageTop {}\n", + figfont::FIGFONT.convert(&app).unwrap(), + &config::SETTINGS.app.description, + env!("CARGO_PKG_VERSION") + ); + return; + } + } + println!( + "\n{}\n{}\n\nPowered by PageTop {}\n", + &config::SETTINGS.app.name, + &config::SETTINGS.app.description, + env!("CARGO_PKG_VERSION") + ); + } +} + // https://stackoverflow.com/a/71464396 pub const fn handle( module_path: &'static str, diff --git a/pagetop/src/base/banner/figfont.rs b/pagetop/src/util/figfont.rs similarity index 100% rename from pagetop/src/base/banner/figfont.rs rename to pagetop/src/util/figfont.rs diff --git a/pagetop/src/base/banner/slant.flf b/pagetop/src/util/slant.flf similarity index 100% rename from pagetop/src/base/banner/slant.flf rename to pagetop/src/util/slant.flf diff --git a/pagetop/src/base/banner/small.flf b/pagetop/src/util/small.flf similarity index 100% rename from pagetop/src/base/banner/small.flf rename to pagetop/src/util/small.flf diff --git a/pagetop/src/base/banner/speed.flf b/pagetop/src/util/speed.flf similarity index 100% rename from pagetop/src/base/banner/speed.flf rename to pagetop/src/util/speed.flf diff --git a/pagetop/src/base/banner/starwars.flf b/pagetop/src/util/starwars.flf similarity index 100% rename from pagetop/src/base/banner/starwars.flf rename to pagetop/src/util/starwars.flf