PlexSheep/pt
PlexSheep
/
pt
Archived
generated from PlexSheep/baserepo
1
0
Fork 0
Code Issues 11 Pull Requests Actions Packages Projects Releases 23 Wiki Activity

refactor(cli): verbosity level no option anymore, prevent verbosity overflows

This commit is contained in:
Christoph J. Scherr 2024-06-29 17:05:37 +02:00
parent 6a7974a0a6
commit 74aaeb0ec2
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
members/libpt-cli/src/args.rs
View File

@ -94,9 +94,9 @@ Author: {author-with-newline}
/// ///
/// // Level might be None if the user wants no output at all. /// // Level might be None if the user wants no output at all.
/// // for the 'tracing' level: /// // for the 'tracing' level:
/// let level: Option<Level> = opts.verbose.level(); /// let level: Level = opts.verbose.level();
/// // for the 'log' level: /// // for the 'log' level:
/// let llevel: Option<log::Level> = opts.verbose.level_for_log_crate(); /// let llevel: log::Level = opts.verbose.level_for_log_crate();
/// } /// }
/// ``` /// ```
#[derive(Parser, Clone, PartialEq, Eq, Hash)] #[derive(Parser, Clone, PartialEq, Eq, Hash)]
@ -134,27 +134,20 @@ impl VerbosityLevel {
} }
#[inline] #[inline]
fn value(&self) -> i8 { fn value(&self) -> i8 {
let v = Self::level_value(Level::INFO) - (self.quiet as i8) + (self.verbose as i8); Self::level_value(Level::INFO) - (self.quiet as i8).min(10) + (self.verbose as i8).min(10)
if v > Self::level_value(Level::TRACE) {
Self::level_value(Level::TRACE)
} else {
v
}
} }
/// get the [Level] for that VerbosityLevel /// get the [Level] for that VerbosityLevel
///
/// [None] means that absolutely no output is wanted (completely quiet)
#[inline] #[inline]
pub fn level(&self) -> Option<Level> { pub fn level(&self) -> Level {
Some(match self.value() { match self.value() {
0 => Level::ERROR, 0 => Level::ERROR,
1 => Level::WARN, 1 => Level::WARN,
2 => Level::INFO, 2 => Level::INFO,
3 => Level::DEBUG, 3 => Level::DEBUG,
4 => Level::TRACE, 4 => Level::TRACE,
_ => return None, _ => Level::ERROR,
}) }
} }
/// get the [log::Level] for that VerbosityLevel /// get the [log::Level] for that VerbosityLevel
@ -163,14 +156,14 @@ impl VerbosityLevel {
/// ///
/// [None] means that absolutely no output is wanted (completely quiet) /// [None] means that absolutely no output is wanted (completely quiet)
#[inline] #[inline]
pub fn level_for_log_crate(&self) -> Option<log::Level> { pub fn level_for_log_crate(&self) -> log::Level {
self.level().map(|ll| match ll { match self.level() {
Level::TRACE => log::Level::Trace, Level::TRACE => log::Level::Trace,
Level::DEBUG => log::Level::Debug, Level::DEBUG => log::Level::Debug,
Level::INFO => log::Level::Info, Level::INFO => log::Level::Info,
Level::WARN => log::Level::Warn, Level::WARN => log::Level::Warn,
Level::ERROR => log::Level::Error, Level::ERROR => log::Level::Error,
}) }
} }
#[inline] #[inline]