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

♻️ Revisa la impresión del banner de inicio

Browse source
This commit is contained in:
Manuel Cillero 2023-05-14 19:56:36 +02:00
parent 199a5defe2
commit 99b08fa201
7 changed files with 28 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

30
pagetop/src/app.rs
View file

@ -1,8 +1,10 @@
mod figfont;
use crate::core::{module, module::ModuleStaticRef};
use crate::html::Markup;
use crate::response::page::ResultPage;
use crate::response::FatalError;
use crate::{config, locale, server, trace, util, LazyStatic};
use crate::{config, locale, server, trace, LazyStatic};
#[cfg(feature = "database")]
use crate::db;
@ -11,6 +13,8 @@ use actix_web::dev::Server;
use std::io::Error;
use substring::Substring;
pub struct Application {
server: Server,
}
@ -18,7 +22,29 @@ pub struct Application {
impl Application {
pub fn prepare(app: ModuleStaticRef) -> Result<Self, Error> {
// Rótulo de presentación.
util::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")
);
}
}
println!(
"\n{}\n{}\n\nPowered by PageTop {}\n",
&config::SETTINGS.app.name,
&config::SETTINGS.app.description,
env!("CARGO_PKG_VERSION")
);
}
// Inicia registro de trazas y eventos.
LazyStatic::force(&trace::TRACING);

0
pagetop/src/util/figfont.rs → pagetop/src/app/figfont.rs
View file

0
pagetop/src/util/slant.flf → pagetop/src/app/slant.flf
View file

0
pagetop/src/util/small.flf → pagetop/src/app/small.flf
View file

0
pagetop/src/util/speed.flf → pagetop/src/app/speed.flf
View file

0
pagetop/src/util/starwars.flf → pagetop/src/app/starwars.flf
View file

33
pagetop/src/util.rs
View file

@ -1,42 +1,9 @@
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,