NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 12:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove --vv flag

Browse source
This commit is contained in:
ByteDream 2023-04-23 13:21:50 +02:00
parent e277b4200f
commit ff258c0722
2 changed files with 10 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crunchy-cli-core/src/lib.rs
View file

@ -5,6 +5,7 @@ use anyhow::bail;
use anyhow::Result; use anyhow::Result;
use clap::{Parser, Subcommand}; use clap::{Parser, Subcommand};
use crunchyroll_rs::crunchyroll::CrunchyrollBuilder; use crunchyroll_rs::crunchyroll::CrunchyrollBuilder;
use crunchyroll_rs::error::CrunchyrollError;
use crunchyroll_rs::{Crunchyroll, Locale}; use crunchyroll_rs::{Crunchyroll, Locale};
use log::{debug, error, warn, LevelFilter}; use log::{debug, error, warn, LevelFilter};
use reqwest::Proxy; use reqwest::Proxy;
@ -15,9 +16,7 @@ mod download;
mod login; mod login;
mod utils; mod utils;
use crate::login::session_file_path;
pub use archive::Archive; pub use archive::Archive;
use crunchyroll_rs::error::CrunchyrollError;
pub use download::Download; pub use download::Download;
pub use login::Login; pub use login::Login;
@ -90,10 +89,6 @@ struct Verbosity {
#[arg(short)] #[arg(short)]
v: bool, v: bool,
#[arg(help = "Very verbose output. Generally not recommended, use '-v' instead")]
#[arg(long)]
vv: bool,
#[arg(help = "Quiet output. Does not print anything unless it's a error")] #[arg(help = "Quiet output. Does not print anything unless it's a error")]
#[arg( #[arg(
long_help = "Quiet output. Does not print anything unless it's a error. Can be helpful if you pipe the output to stdout" long_help = "Quiet output. Does not print anything unless it's a error. Can be helpful if you pipe the output to stdout"
@ -124,18 +119,16 @@ pub async fn cli_entrypoint() {
let mut cli: Cli = Cli::parse(); let mut cli: Cli = Cli::parse();
if let Some(verbosity) = &cli.verbosity { if let Some(verbosity) = &cli.verbosity {
if verbosity.v as u8 + verbosity.q as u8 + verbosity.vv as u8 > 1 { if verbosity.v as u8 + verbosity.q as u8 > 1 {
eprintln!("Output cannot be verbose ('-v') and quiet ('-q') at the same time"); eprintln!("Output cannot be verbose ('-v') and quiet ('-q') at the same time");
std::process::exit(1) std::process::exit(1)
} else if verbosity.v { } else if verbosity.v {
CliLogger::init(false, LevelFilter::Debug).unwrap() CliLogger::init(LevelFilter::Debug).unwrap()
} else if verbosity.q { } else if verbosity.q {
CliLogger::init(false, LevelFilter::Error).unwrap() CliLogger::init(LevelFilter::Error).unwrap()
} else if verbosity.vv {
CliLogger::init(true, LevelFilter::Debug).unwrap()
} }
} else { } else {
CliLogger::init(false, LevelFilter::Info).unwrap() CliLogger::init(LevelFilter::Info).unwrap()
} }
debug!("cli input: {:?}", cli); debug!("cli input: {:?}", cli);
@ -145,7 +138,7 @@ pub async fn cli_entrypoint() {
Command::Download(download) => pre_check_executor(download).await, Command::Download(download) => pre_check_executor(download).await,
Command::Login(login) => { Command::Login(login) => {
if login.remove { if login.remove {
if let Some(session_file) = session_file_path() { if let Some(session_file) = login::session_file_path() {
let _ = fs::remove_file(session_file); let _ = fs::remove_file(session_file);
} }
return; return;

10
crunchy-cli-core/src/utils/log.rs
View file

@ -50,7 +50,6 @@ pub(crate) use tab_info;
#[allow(clippy::type_complexity)] #[allow(clippy::type_complexity)]
pub struct CliLogger { pub struct CliLogger {
all: bool,
level: LevelFilter, level: LevelFilter,
progress: Mutex<Option<ProgressBar>>, progress: Mutex<Option<ProgressBar>>,
} }
@ -64,7 +63,7 @@ impl Log for CliLogger {
if !self.enabled(record.metadata()) if !self.enabled(record.metadata())
|| (record.target() != "progress" || (record.target() != "progress"
&& record.target() != "progress_end" && record.target() != "progress_end"
&& (!self.all && !record.target().starts_with("crunchy_cli"))) && !record.target().starts_with("crunchy_cli"))
{ {
return; return;
} }
@ -95,17 +94,16 @@ impl Log for CliLogger {
} }
impl CliLogger { impl CliLogger {
pub fn new(all: bool, level: LevelFilter) -> Self { pub fn new(level: LevelFilter) -> Self {
Self { Self {
all,
level, level,
progress: Mutex::new(None), progress: Mutex::new(None),
} }
} }
pub fn init(all: bool, level: LevelFilter) -> Result<(), SetLoggerError> { pub fn init(level: LevelFilter) -> Result<(), SetLoggerError> {
set_max_level(level); set_max_level(level);
set_boxed_logger(Box::new(CliLogger::new(all, level))) set_boxed_logger(Box::new(CliLogger::new(level)))
} }
fn extended(&self, record: &Record) { fn extended(&self, record: &Record) {