From ff258c072220ee494eaf4e5302a0b9ec81107227 Mon Sep 17 00:00:00 2001
From: ByteDream <bytedream@protonmail.com>
Date: Sun, 23 Apr 2023 13:21:50 +0200
Subject: [PATCH] Remove --vv flag

---
 crunchy-cli-core/src/lib.rs       | 19 ++++++-------------
 crunchy-cli-core/src/utils/log.rs | 10 ++++------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/crunchy-cli-core/src/lib.rs b/crunchy-cli-core/src/lib.rs
index 65c3ca1..fee019f 100644
--- a/crunchy-cli-core/src/lib.rs
+++ b/crunchy-cli-core/src/lib.rs
@@ -5,6 +5,7 @@ use anyhow::bail;
 use anyhow::Result;
 use clap::{Parser, Subcommand};
 use crunchyroll_rs::crunchyroll::CrunchyrollBuilder;
+use crunchyroll_rs::error::CrunchyrollError;
 use crunchyroll_rs::{Crunchyroll, Locale};
 use log::{debug, error, warn, LevelFilter};
 use reqwest::Proxy;
@@ -15,9 +16,7 @@ mod download;
 mod login;
 mod utils;
 
-use crate::login::session_file_path;
 pub use archive::Archive;
-use crunchyroll_rs::error::CrunchyrollError;
 pub use download::Download;
 pub use login::Login;
 
@@ -90,10 +89,6 @@ struct Verbosity {
     #[arg(short)]
     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(
         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();
 
     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");
             std::process::exit(1)
         } else if verbosity.v {
-            CliLogger::init(false, LevelFilter::Debug).unwrap()
+            CliLogger::init(LevelFilter::Debug).unwrap()
         } else if verbosity.q {
-            CliLogger::init(false, LevelFilter::Error).unwrap()
-        } else if verbosity.vv {
-            CliLogger::init(true, LevelFilter::Debug).unwrap()
+            CliLogger::init(LevelFilter::Error).unwrap()
         }
     } else {
-        CliLogger::init(false, LevelFilter::Info).unwrap()
+        CliLogger::init(LevelFilter::Info).unwrap()
     }
 
     debug!("cli input: {:?}", cli);
@@ -145,7 +138,7 @@ pub async fn cli_entrypoint() {
         Command::Download(download) => pre_check_executor(download).await,
         Command::Login(login) => {
             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);
                 }
                 return;
diff --git a/crunchy-cli-core/src/utils/log.rs b/crunchy-cli-core/src/utils/log.rs
index 8472250..37bc5a9 100644
--- a/crunchy-cli-core/src/utils/log.rs
+++ b/crunchy-cli-core/src/utils/log.rs
@@ -50,7 +50,6 @@ pub(crate) use tab_info;
 
 #[allow(clippy::type_complexity)]
 pub struct CliLogger {
-    all: bool,
     level: LevelFilter,
     progress: Mutex<Option<ProgressBar>>,
 }
@@ -64,7 +63,7 @@ impl Log for CliLogger {
         if !self.enabled(record.metadata())
             || (record.target() != "progress"
                 && record.target() != "progress_end"
-                && (!self.all && !record.target().starts_with("crunchy_cli")))
+                && !record.target().starts_with("crunchy_cli"))
         {
             return;
         }
@@ -95,17 +94,16 @@ impl Log for CliLogger {
 }
 
 impl CliLogger {
-    pub fn new(all: bool, level: LevelFilter) -> Self {
+    pub fn new(level: LevelFilter) -> Self {
         Self {
-            all,
             level,
             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_boxed_logger(Box::new(CliLogger::new(all, level)))
+        set_boxed_logger(Box::new(CliLogger::new(level)))
     }
 
     fn extended(&self, record: &Record) {