idk why this isn't in master yet #94

Merged
cscherrNT merged 79 commits from devel into master 2024-07-22 13:30:20 +02:00
3 changed files with 72 additions and 13 deletions
Showing only changes of commit 90cf678dde - Show all commits

View File

@ -14,7 +14,7 @@ categories.workspace = true
[features] [features]
default = ["log"] default = ["log"]
log = ["dep:libpt-log"] log = ["dep:libpt-log", "dep:log"]
[dependencies] [dependencies]
anyhow.workspace = true anyhow.workspace = true
@ -23,4 +23,5 @@ comfy-table = "7.1.1"
console = "0.15.8" console = "0.15.8"
dialoguer = "0.11.0" dialoguer = "0.11.0"
indicatif = "0.17.8" indicatif = "0.17.8"
libpt-log = {workspace = true, optional = true} libpt-log = { workspace = true, optional = true }
log = { version = "0.4.21", optional = true }

View File

@ -1,5 +1,10 @@
//! Utilities for parsing options and arguments on the start of a CLI application
use clap::Parser; use clap::Parser;
#[cfg(feature = "log")]
use libpt_log::Level; use libpt_log::Level;
#[cfg(feature = "log")]
use log;
/// Custom help template for displaying command-line usage information /// Custom help template for displaying command-line usage information
/// ///
@ -50,17 +55,52 @@ pub const HELP_TEMPLATE: &str = r#"{about-section}
Author: {author-with-newline} Author: {author-with-newline}
"#; "#;
#[derive(Parser, Debug, Clone, PartialEq, Eq, Hash)] /// Transform -v and -q flags to some kind of loglevel
#[command(help_template = HELP_TEMPLATE)] ///
pub struct DefaultArguments { /// # Example
/// get a [tracing] log level ///
/// /// Include this into your [clap] derive struct like this:
/// set the verbosity with repeated '-q' and '-v' flags ///
#[command(flatten)] /// ```
verbose: VerbosityLevel, /// use libpt_cli::args::VerbosityLevel;
} /// use clap::Parser;
///
/// #[derive(Parser, Debug)]
/// pub struct Opts {
/// #[command(flatten)]
/// pub verbose: VerbosityLevel,
/// #[arg(short, long)]
/// pub mynum: usize,
/// }
///
/// ```
///
/// Get the loglevel like this:
///
/// ```no_run
/// # use libpt_cli::args::VerbosityLevel;
/// use libpt_log::Level;
/// # use clap::Parser;
/// use log;
///
/// # #[derive(Parser, Debug)]
/// # pub struct Opts {
/// # #[command(flatten)]
/// # pub verbose: VerbosityLevel,
/// # }
///
/// fn main() {
/// let opts = Opts::parse();
///
/// // Level might be None if the user wants no output at all.
/// // for the 'tracing' level:
/// let level: Option<Level> = opts.verbose.level();
/// // for the 'log' level:
/// let llevel: Option<log::Level> = opts.verbose.level_for_log_crate();
/// }
/// ```
#[derive(Parser, Clone, PartialEq, Eq, Hash)] #[derive(Parser, Clone, PartialEq, Eq, Hash)]
#[cfg(feature = "log")]
pub struct VerbosityLevel { pub struct VerbosityLevel {
/// make the output more verbose /// make the output more verbose
#[arg( #[arg(
@ -116,6 +156,23 @@ impl VerbosityLevel {
_ => return None, _ => return None,
}) })
} }
/// get the [log::Level] for that VerbosityLevel
///
/// This is the method for the [log] crate, which I use less often.
///
/// [None] means that absolutely no output is wanted (completely quiet)
#[inline]
pub fn level_for_log_crate(&self) -> Option<log::Level> {
self.level().map(|ll| match ll {
Level::TRACE => log::Level::Trace,
Level::DEBUG => log::Level::Debug,
Level::INFO => log::Level::Info,
Level::WARN => log::Level::Warn,
Level::ERROR => log::Level::Error,
})
}
#[inline] #[inline]
fn level_value(level: Level) -> i8 { fn level_value(level: Level) -> i8 {
match level { match level {
@ -129,6 +186,7 @@ impl VerbosityLevel {
} }
impl std::fmt::Debug for VerbosityLevel { impl std::fmt::Debug for VerbosityLevel {
#[inline]
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{:?}", self.level()) write!(f, "{:?}", self.level())
} }

View File

@ -1,4 +1,4 @@
//! Utilities for formatting, bordering, aligning and printing text content. //! Utilities for formatting, bordering, aligning and printing text content
//! //!
//! This module provides functions for formatting content with borders and colors, printing them to the console. //! This module provides functions for formatting content with borders and colors, printing them to the console.
//! The functions in this module are designed to simplify the process of creating visually appealing //! The functions in this module are designed to simplify the process of creating visually appealing