arnekeller/KIT-ILIAS-downloader
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/KIT-ILIAS-downloader.git synced 2024-08-28 04:04:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix logging when the progress bar is enabled

Browse Source
This commit is contained in:
FliegendeWurst 2021-05-17 18:12:11 +02:00
parent 044caf497c
commit 6d4a1903fb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/cli.rs
View File

@ -2,7 +2,10 @@
use std::{path::PathBuf, sync::atomic::{AtomicBool, AtomicUsize}}; use std::{path::PathBuf, sync::atomic::{AtomicBool, AtomicUsize}};
use anyhow::{anyhow, Context, Result}; #[cfg(feature = "keyring-auth")]
use anyhow::anyhow;
use anyhow::{Context, Result};
#[cfg(feature = "keyring-auth")]
use colored::Colorize as _; use colored::Colorize as _;
use indicatif::ProgressBar; use indicatif::ProgressBar;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
@ -92,37 +95,37 @@ macro_rules! log {
macro_rules! info { macro_rules! info {
($t:tt) => { ($t:tt) => {
println!($t); log!(0, $t);
}; };
} }
macro_rules! success { macro_rules! success {
($t:tt) => { ($t:tt) => {
println!("{}", format!($t).bright_green()); log!(0, "{}", format!($t).bright_green());
}; };
} }
macro_rules! warning { macro_rules! warning {
($e:expr) => { ($e:expr) => {
println!("Warning: {}", format!("{:?}", $e).bright_yellow()); log!(0, "Warning: {}", format!("{:?}", $e).bright_yellow());
}; };
($msg:expr, $e:expr) => { ($msg:expr, $e:expr) => {
println!("Warning: {}", format!("{} {:?}", $msg, $e).bright_yellow()); log!(0, "Warning: {}", format!("{} {:?}", $msg, $e).bright_yellow());
}; };
($msg1:expr, $msg2:expr, $e:expr) => { ($msg1:expr, $msg2:expr, $e:expr) => {
println!("Warning: {}", format!("{} {} {:?}", $msg1, $msg2, $e).bright_yellow()); log!(0, "Warning: {}", format!("{} {} {:?}", $msg1, $msg2, $e).bright_yellow());
}; };
(format => $($e:expr),+) => { (format => $($e:expr),+) => {
println!("Warning: {}", format!($($e),+).bright_yellow()); log!(0, "Warning: {}", format!($($e),+).bright_yellow());
}; };
} }
macro_rules! error { macro_rules! error {
($($prefix:expr),+; $e:expr) => { ($($prefix:expr),+; $e:expr) => {
println!("{}: {}", format!($($prefix),+), format!("{:?}", $e).bright_red()); log!(0, "{}: {}", format!($($prefix),+), format!("{:?}", $e).bright_red());
}; };
($e:expr) => { ($e:expr) => {
println!("Error: {}", format!("{:?}", $e).bright_red()); log!(0, "Error: {}", format!("{:?}", $e).bright_red());
}; };
} }