- Commit
- 0324caf04db9198a9c4c70a96a43c94bf428de08
- Parent
- 928c45397c7b3abd6e617e046be7c79d1eafc490
- Author
- Pablo <pablo-pie@riseup.net>
- Date
Restyled the log messages
Also removed the dependencie on crossterm: we're now row-dogging UNIX escape codes
yagit
Yet another static site generator for Git 🙀️
Diffstats
4 files changed, 113 insertions, 377 deletions
| Status | Name | Changes | Insertions | Deletions |
| Modified | Cargo.lock | 2 files changed | 0 | 286 |
| Modified | Cargo.toml | 2 files changed | 0 | 1 |
| Modified | src/log.rs | 2 files changed | 109 | 88 |
| Modified | src/main.rs | 2 files changed | 4 | 2 |
diff --git a/Cargo.lock b/Cargo.lock @@ -3,12 +3,6 @@ version = 4 [[package]] -name = "autocfg" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" - -[[package]] name = "bitflags" version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -26,37 +20,6 @@ dependencies = [ ] [[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] name = "displaydoc" version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -301,16 +264,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] name = "log" version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -323,18 +276,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys", -] - -[[package]] name = "openssl-probe" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -353,29 +294,6 @@ dependencies = [ ] [[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - -[[package]] name = "percent-encoding" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -425,21 +343,6 @@ dependencies = [ ] [[package]] -name = "redox_syscall" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" -dependencies = [ - "bitflags", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] name = "serde" version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -466,36 +369,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -587,164 +460,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" -dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" - -[[package]] name = "write16" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -760,7 +475,6 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" name = "yagit" version = "0.1.0" dependencies = [ - "crossterm", "git2", "libc", "pulldown-cmark",
diff --git a/Cargo.toml b/Cargo.toml @@ -8,4 +8,3 @@ description = "Yet another static site generator for Git" git2 = "0.20.0" libc = "0.2.170" pulldown-cmark = "0.13.0" -crossterm = "0.27.0"
diff --git a/src/log.rs b/src/log.rs @@ -3,132 +3,153 @@ //! This implementation should be thread safe (unlink an implementation using //! `println!` and `eprintln!`) because access to the global stdout/stderr //! handle is syncronized using a lock. -use crossterm::style::Stylize; use std::{io::{self, Write}, fmt::Arguments}; +pub const BOLD_GREEN: &str = "\u{001b}[1;32m"; +pub const BOLD_RED: &str = "\u{001b}[1;31m"; +pub const BOLD_YELLOW: &str = "\u{001b}[1;33m"; +pub const RESET: &str = "\u{001b}[0m"; + #[derive(Clone, Copy, Debug)] pub(crate) enum Level { - Error, - Info, - Warn, + Error, + Info, + Warn, } pub(crate) fn log(level: Level, args: &Arguments<'_>, newline: bool) { - match level { - Level::Error => { - let mut stderr = io::stderr(); - let _ = write!(stderr, "{} ", "[ERROR]".red().bold()); - let _ = if newline { - writeln!(stderr, "{}", args) - } else { - write!(stderr, "{}", args) - }; - if !newline { let _ = stderr.flush(); } - } - Level::Info => { - let mut stdout = io::stdout().lock(); - let _ = write!(stdout, "{} ", "[INFO]".green().bold()); - let _ = if newline { - writeln!(stdout, "{}", args) - } else { - write!(stdout, "{}", args) - }; - if !newline { let _ = stdout.flush(); } - } - Level::Warn => { - let mut stdout = io::stdout().lock(); - let _ = write!(stdout, "{} ", "[WARNING]".yellow().bold()); - let _ = if newline { - writeln!(stdout, "{}", args) - } else { - write!(stdout, "{}", args) - }; - if !newline { let _ = stdout.flush(); } - } + match level { + Level::Error => { + let mut stderr = io::stderr(); + let _ = write!(stderr, "{BOLD_RED}=> ERROR:{RESET} "); + let _ = if newline { + writeln!(stderr, "{}", args) + } else { + write!(stderr, "{}", args) + }; + if !newline { let _ = stderr.flush(); } + } + Level::Info => { + let mut stdout = io::stdout().lock(); + let _ = write!(stdout, "{BOLD_GREEN}=>{RESET} "); + let _ = if newline { + writeln!(stdout, "{}", args) + } else { + write!(stdout, "{}", args) + }; + if !newline { let _ = stdout.flush(); } + } + Level::Warn => { + let mut stdout = io::stdout().lock(); + let _ = write!(stdout, "{BOLD_YELLOW}=> WARNING:{RESET} "); + let _ = if newline { + writeln!(stdout, "{}", args) + } else { + write!(stdout, "{}", args) + }; + if !newline { let _ = stdout.flush(); } } + } } #[macro_export] macro_rules! info { - // info!("a {} event", "log"); - ($($arg:tt)+) => ({ - $crate::log::log( - $crate::log::Level::Info, - &std::format_args!($($arg)+), - false, - ); - }); + // info!("a {} event", "log"); + ($($arg:tt)+) => ({ + $crate::log::log( + $crate::log::Level::Info, + &std::format_args!($($arg)+), + false, + ); + }); } #[macro_export] macro_rules! infoln { - // infoln!("a {} event", "log"); - ($($arg:tt)+) => ({ - $crate::log::log( - $crate::log::Level::Info, - &std::format_args!($($arg)+), - true, - ); - }); + // infoln!("a {} event", "log"); + ($($arg:tt)+) => ({ + $crate::log::log( + $crate::log::Level::Info, + &std::format_args!($($arg)+), + true, + ); + }); } #[macro_export] macro_rules! info_done { - () => ({ - let _ = writeln!(io::stdout().lock(), " done!"); - }); + () => ({ + let _ = writeln!(io::stdout().lock(), " done!"); + }); - // infoln!("a {} event", "log"); - ($($arg:tt)+) => ({ - let _ = writeln!( - io::stdout().lock(), - " {}", - &std::format_args!($($arg)+) - ); - }); + // infoln!("a {} event", "log"); + ($($arg:tt)+) => ({ + let _ = writeln!( + io::stdout().lock(), + " {}", + &std::format_args!($($arg)+) + ); + }); +} + +#[macro_export] +macro_rules! info_count { + ($count:expr, $total:expr; $($arg:tt)+) => ({ + use crate::log::{BOLD_GREEN, RESET}; + let mut stdout = io::stdout().lock(); + let _ = write!( + stdout, + "{BOLD_GREEN}[{count:>padding$}/{total}]{RESET} {args}", + count = $count, + total = $total, + padding = crate::log_floor($total), + args = std::format_args!($($arg)+) + ); + let _ = stdout.flush(); + }); } #[macro_export] macro_rules! error { - // info!("a {} event", "log"); - ($($arg:tt)+) => ({ - $crate::log::log( - $crate::log::Level::Error, - &std::format_args!($($arg)+), - false, - ); - }); + // info!("a {} event", "log"); + ($($arg:tt)+) => ({ + $crate::log::log( + $crate::log::Level::Error, + &std::format_args!($($arg)+), + false, + ); + }); } #[macro_export] macro_rules! errorln { - // errorln!("a {} event", "log"); - ($($arg:tt)+) => ({ - $crate::log::log( - $crate::log::Level::Error, - &std::format_args!($($arg)+), - true, - ); - }); + // errorln!("a {} event", "log"); + ($($arg:tt)+) => ({ + $crate::log::log( + $crate::log::Level::Error, + &std::format_args!($($arg)+), + true, + ); + }); } #[macro_export] macro_rules! warnln { - // info!("a {} event", "log"); - ($($arg:tt)+) => ({ - $crate::log::log( - $crate::log::Level::Warn, - &std::format_args!($($arg)+), - true, - ); - }); + // info!("a {} event", "log"); + ($($arg:tt)+) => ({ + $crate::log::log( + $crate::log::Level::Warn, + &std::format_args!($($arg)+), + true, + ); + }); } pub fn usage(program_name: &str) { let mut stderr = io::stderr(); let _ = writeln!( stderr, - "{usage_header_msg} {program_name} render REPO_PATH OUTPUT_PATH\n{usage_header_msg} {program_name} render-batch BATCH_PATH OUTPUT_PATH", - usage_header_msg = "[USAGE]".yellow().bold() + r#" {BOLD_YELLOW}USAGE:{RESET} {program_name} render REPO_PATH OUTPUT_PATH + {program_name} render-batch BATCH_PATH OUTPUT_PATH"# ); }
diff --git a/src/main.rs b/src/main.rs @@ -1506,8 +1506,10 @@ fn main() -> ExitCode { } info_done!(); - for repo in repos { - info!("Updating pages for {name:?}...", name = repo.name); + let n_repos = repos.len(); + infoln!("Updating pages for git repositories at {batch_path:?}..."); + for (i, repo) in repos.into_iter().enumerate() { + info_count!(i + 1, n_repos; "{name}...", name = repo.name); let renderer = if let Ok(r) = RepoRenderer::new(repo, &output_path) { r