aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author魏曹先生 <1992414357@qq.com>2026-08-15 19:51:27 +0800
committer魏曹先生 <1992414357@qq.com>2026-08-15 19:51:27 +0800
commit046ac064b6f4790f9053ad1e6109843bb38f89dd (patch)
tree80c16af0d217f69001b3fad7a02dea49c2a3aebc
parentaa2b0daa88089df32b3ea67d7c1831b5d8fd64f8 (diff)
feat: move OSC94 under its own module and add confirmer predicates
Extract OSC94 state and guard types from `res` into a dedicated `osc94` module, and add `ConfirmerCount` and `ConfirmerPredicate` types with `YesConfirm` and `TrueConfirm` implementations.
-rw-r--r--CHANGELOG.md18
-rw-r--r--mingling/src/confirm.rs5
-rw-r--r--mingling/src/confirm/count.rs31
-rw-r--r--mingling/src/confirm/predicate.rs60
-rw-r--r--mingling/src/lib.rs6
-rw-r--r--mingling/src/osc94.rs5
-rw-r--r--mingling/src/osc94/guard.rs203
-rw-r--r--mingling/src/osc94/state.rs243
-rw-r--r--mingling/src/res/confirmer.rs108
-rw-r--r--mingling/src/res/osc94.rs205
-rw-r--r--mingling/src/res/osc94/state.rs74
11 files changed, 579 insertions, 379 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9029c61..958726a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -377,7 +377,7 @@ None
The `ArgumentSplitter` trait is a public API addition, so downstream code can now reuse the same argument-splitting logic that the REPL uses for parsing input lines.
-14. **[`res`]** Added the `Confirmer` resource:
+14. **[`confirm`]** Added the `Confirmer` resource and its confirmation predicates:
- **`mingling::res::Confirmer`** — A new resource type for interactive confirmation prompts. It caches the confirmed state to avoid repeated prompts, and is typically registered via [`ConfirmerSetup`] and injected into functions through Mingling's resource injection system.
@@ -387,15 +387,15 @@ None
- **`ask<P: ConfirmerPredicate>(&self, ask: impl AsRef<str>) -> bool`** — Prompts the user at most **one** time. Returns `false` if the user provides an unrecognizable answer, `true` if already confirmed.
- **`try_ask<P: ConfirmerPredicate>(&self, ask: impl AsRef<str>, count: impl Into<ConfirmerCount>) -> Option<bool>`** — Prompts the user up to `count` times. Returns `Some(true)` for confirmation, `Some(false)` for rejection, and `None` if the maximum attempts are exhausted without a parseable answer. The prompt is written to stderr.
- - **`ConfirmerCount` enum** — Specifies the maximum number of attempts: `Loop` (0, indefinite) or `Max(usize)` (positive integer). `From` impls are provided for all integer types (`i8`, `i16`, `i32`, `i64`, `i128`, `isize`, `u8`, `u16`, `u32`, `u64`, `u128`, `usize`); `0` maps to `Loop`, negative values clamp to `Max(usize::MAX)`.
+ - **`mingling::confirm::ConfirmerCount`** — Specifies the maximum number of attempts: `Loop` (0, indefinite) or `Max(usize)` (positive integer). `From` impls are provided for all integer types (`i8`, `i16`, `i32`, `i64`, `i128`, `isize`, `u8`, `u16`, `u32`, `u64`, `u128`, `usize`); `0` maps to `Loop`, negative values clamp to `Max(usize::MAX)`.
- - **`ConfirmerPredicate` trait** — Defines how to parse user confirmation input. Implementors provide `is_yes(str: &str) -> Option<bool>`: `Some(true)` for yes, `Some(false)` for no, `None` for unparseable input (requiring re-entry).
+ - **`mingling::confirm::ConfirmerPredicate`** — Defines how to parse user confirmation input. Implementors provide `is_yes(str: &str) -> Option<bool>`: `Some(true)` for yes, `Some(false)` for no, `None` for unparseable input (requiring re-entry).
- - **`YesConfirm` predicate** — Accepts `"y"`/`"yes"` as yes and `"n"`/`"no"` as no. Case-insensitive with leading/trailing whitespace trimming.
+ - **`mingling::confirm::YesConfirm`** — Accepts `"y"`/`"yes"` as yes and `"n"`/`"no"` as no. Case-insensitive with leading/trailing whitespace trimming.
- - **`TrueConfirm` predicate** — Accepts `"true"`/`"t"` as yes and `"false"`/`"f"` as no. Case-insensitive with leading/trailing whitespace trimming.
+ - **`mingling::confirm::TrueConfirm`** — Accepts `"true"`/`"t"` as yes and `"false"`/`"f"` as no. Case-insensitive with leading/trailing whitespace trimming.
- Derives `Debug`, `Default`, `Clone`, `Copy`.
+ The `Confirmer` resource derives `Debug`, `Default`, `Clone`, `Copy`. The `confirm` module also houses `ConfirmerCount`, `ConfirmerPredicate`, `YesConfirm`, and `TrueConfirm` at `mingling::confirm::*`.
15. **[`setups`]** Added the `ConfirmerSetup` and `StandardInputArgsSetup` program setups:
@@ -412,7 +412,7 @@ None
- Empty input produces no arguments.
- **Note:** the setup does **not** validate input — stdin content is treated as trusted arguments appended directly, so untrusted input can inject arbitrary arguments. It also has no per-subcommand granularity; if different subcommands need different stdin behavior, do not use this setup.
-16. **[`res:osc94`]** **[`setups:osc94`]** Added the `OSC94` resource and `OSC94Setup` for managing terminal `OSC 9;4` protocol status:
+16. **[`osc94`]** **[`setups:osc94`]** Added the `OSC94` resource and `OSC94Setup` for managing terminal `OSC 9;4` protocol status:
### `OSC94` resource
- **`mingling::res::OSC94`** — A new resource type providing support for the [OSC 9;4 protocol](https://learn.microsoft.com/en-us/windows/terminal/tutorials/progress-bar-sequences), which allows sending task progress notifications via ANSI escape sequences. It is typically registered via [`OSC94Setup`] and injected into functions through Mingling's resource injection system.
@@ -422,7 +422,7 @@ None
Derives `Debug`, `Default`, `Clone`, `Copy`.
### `OSC94Guard`
- - **`mingling::res::OSC94Guard`** — A guard for modifying process state, obtained via [`OSC94::get_mut`]. When the guard is dropped, the process state is automatically restored to [`OSC94State::Clean`], so no manual cleanup is needed.
+ - **`mingling::osc94::OSC94Guard`** — A guard for modifying process state, obtained via [`OSC94::get_mut`]. When the guard is dropped, the process state is automatically restored to [`OSC94State::Clean`], so no manual cleanup is needed.
- **`set_clean_state(&mut self)`** — Sets the process state to Clean, indicating the process has finished or is in a normal, problem-free state.
- **`set_error_state(&mut self)`** — Sets the process state to Error, indicating an error occurred during process execution.
@@ -433,7 +433,7 @@ None
- **`progress(&self) -> f32`** — Returns the actual progress value only when the state is `OSC94State::Normal`; otherwise returns `0.0`.
### `OSC94State` enum
- - **`mingling::res::OSC94State`** — Represents the `OSC 9;4` protocol message state:
+ - **`mingling::osc94::OSC94State`** — Represents the `OSC 9;4` protocol message state:
- **`Clean`** — Clears/hides progress (used when task completes), corresponding to state code `0`.
- **`Normal(f32)`** — Normal state, state code `1`, requires a progress value (0-100).
diff --git a/mingling/src/confirm.rs b/mingling/src/confirm.rs
new file mode 100644
index 0000000..45a12d8
--- /dev/null
+++ b/mingling/src/confirm.rs
@@ -0,0 +1,5 @@
+mod predicate;
+pub use predicate::*;
+
+mod count;
+pub use count::*;
diff --git a/mingling/src/confirm/count.rs b/mingling/src/confirm/count.rs
new file mode 100644
index 0000000..b9753c2
--- /dev/null
+++ b/mingling/src/confirm/count.rs
@@ -0,0 +1,31 @@
+/// Specifies the maximum number of attempts for a confirmation prompt.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ConfirmerCount {
+ /// Loop indefinitely until the user gives a parseable answer.
+ Loop,
+ /// Ask at most the specified number of times.
+ Max(usize),
+}
+
+macro_rules! impl_from_for_confirmer_count {
+ ($($t:ty),*) => {
+ $(
+ impl From<$t> for ConfirmerCount {
+ fn from(n: $t) -> Self {
+ if n == 0 {
+ ConfirmerCount::Loop
+ } else {
+ match usize::try_from(n) {
+ Ok(max) => ConfirmerCount::Max(max),
+ Err(_) => ConfirmerCount::Max(usize::MAX),
+ }
+ }
+ }
+ }
+ )*
+ };
+}
+
+impl_from_for_confirmer_count!(
+ i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize
+);
diff --git a/mingling/src/confirm/predicate.rs b/mingling/src/confirm/predicate.rs
new file mode 100644
index 0000000..f812608
--- /dev/null
+++ b/mingling/src/confirm/predicate.rs
@@ -0,0 +1,60 @@
+/// Defines how to parse user confirmation input.
+///
+/// A type implementing this trait determines which user input strings are treated as "yes" or "no".
+pub trait ConfirmerPredicate {
+ /// Parses the user's input string, returning whether it is "yes".
+ ///
+ /// Returns `Some(true)` for yes, `Some(false)` for no,
+ /// and `None` if the input cannot be parsed (requiring re-entry).
+ fn is_yes(str: &str) -> Option<bool>;
+}
+
+/// A `ConfirmerPredicate` implementation that accepts "y"/"yes" as yes and "n"/"no" as no.
+///
+/// Input comparison is case-insensitive and automatically trims leading/trailing whitespace.
+///
+/// # Examples
+///
+/// ```
+/// use mingling::res::Confirmer;
+/// use mingling::confirm::YesConfirm;
+///
+/// let confirmer = Confirmer::default();
+/// let confirmed = confirmer.ask::<YesConfirm>("Continue? [y/n] ");
+/// ```
+pub struct YesConfirm;
+
+/// A `ConfirmerPredicate` implementation that accepts "true"/"t" as yes and "false"/"f" as no.
+///
+/// Input comparison is case-insensitive and automatically trims leading/trailing whitespace.
+///
+/// # Examples
+///
+/// ```
+/// use mingling::res::Confirmer;
+/// use mingling::confirm::TrueConfirm;
+///
+/// let confirmer = Confirmer::default();
+/// let confirmed = confirmer.ask::<TrueConfirm>("Enable this feature? [true/false] ");
+/// ```
+pub struct TrueConfirm;
+
+impl ConfirmerPredicate for YesConfirm {
+ fn is_yes(str: &str) -> Option<bool> {
+ match str.trim().to_lowercase().as_str() {
+ "y" | "yes" => Some(true),
+ "n" | "no" => Some(false),
+ _ => None,
+ }
+ }
+}
+
+impl ConfirmerPredicate for TrueConfirm {
+ fn is_yes(str: &str) -> Option<bool> {
+ match str.trim().to_lowercase().as_str() {
+ "true" | "t" => Some(true),
+ "false" | "f" => Some(false),
+ _ => None,
+ }
+ }
+}
diff --git a/mingling/src/lib.rs b/mingling/src/lib.rs
index 59ef7a6..9d38a2a 100644
--- a/mingling/src/lib.rs
+++ b/mingling/src/lib.rs
@@ -23,6 +23,9 @@ pub mod CRATE_ROOT {
#[cfg(feature = "core")]
pub mod metadata;
+/// Support for the `OSC 9;4` protocol
+pub mod osc94;
+
#[cfg(feature = "core")]
mod example_docs;
@@ -143,6 +146,9 @@ pub use mingling_macros::Grouped;
#[cfg(feature = "structural_renderer")]
pub use mingling_macros::StructuralData;
+/// Mingling's confirmation module, providing core support for Confirmer
+pub mod confirm;
+
#[doc = include_str!("docs/docsrs_examples.md")]
#[cfg(all(feature = "core", feature = "docs_rs"))]
#[allow(nonstandard_style)]
diff --git a/mingling/src/osc94.rs b/mingling/src/osc94.rs
new file mode 100644
index 0000000..7dabb4a
--- /dev/null
+++ b/mingling/src/osc94.rs
@@ -0,0 +1,5 @@
+mod guard;
+pub use guard::*;
+
+mod state;
+pub use state::*;
diff --git a/mingling/src/osc94/guard.rs b/mingling/src/osc94/guard.rs
new file mode 100644
index 0000000..99c1084
--- /dev/null
+++ b/mingling/src/osc94/guard.rs
@@ -0,0 +1,203 @@
+use crate::osc94::OSC94State;
+
+/// A guard for modifying process state.
+///
+/// Obtained via [`OSC94::get_mut`]. When the guard is dropped, the process state is
+/// automatically restored to `OS94State::Clean`, so no manual cleanup is needed.
+///
+/// # Example
+///
+/// Create a guard via [`OSC94`], and the state is automatically restored to Clean
+/// when the guard is dropped:
+///
+/// ```
+/// use mingling::res::OSC94;
+/// use mingling::osc94::OSC94Guard;
+///
+/// let osc94 = OSC94::default();
+/// {
+/// let mut guard: OSC94Guard = osc94.get_mut();
+/// guard.set_progress(0.5);
+/// // When leaving this scope, the guard is dropped and the process state is automatically restored to Clean
+/// }
+/// ```
+pub struct OSC94Guard {
+ pub(crate) is_support: bool,
+ pub(crate) msg: OSC94State,
+}
+
+impl OSC94Guard {
+ /// Set the process state to Clean.
+ ///
+ /// Indicates that the process has finished or is in a normal, problem-free state.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::{OSC94Guard, OSC94State};
+ ///
+ /// let osc94 = OSC94::default();
+ /// let mut guard: OSC94Guard = osc94.get_mut();
+ /// guard.set_progress(0.5);
+ /// guard.set_clean_state();
+ /// assert_eq!(guard.state(), OSC94State::Clean);
+ /// ```
+ pub fn set_clean_state(&mut self) {
+ self.msg = OSC94State::Clean;
+ if self.is_support {
+ self.msg.send();
+ }
+ }
+
+ /// Set the process state to Error.
+ ///
+ /// Indicates that an error occurred during process execution.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::{OSC94Guard, OSC94State};
+ ///
+ /// let osc94 = OSC94::default();
+ /// let mut guard: OSC94Guard = osc94.get_mut();
+ /// guard.set_error_state();
+ /// assert_eq!(guard.state(), OSC94State::Error);
+ /// ```
+ pub fn set_error_state(&mut self) {
+ self.msg = OSC94State::Error;
+ if self.is_support {
+ self.msg.send();
+ }
+ }
+
+ /// Set the process state to Warn.
+ ///
+ /// Indicates that a warning occurred during process execution, but it has not
+ /// reached the level of an error.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::{OSC94Guard, OSC94State};
+ ///
+ /// let osc94 = OSC94::default();
+ /// let mut guard: OSC94Guard = osc94.get_mut();
+ /// guard.set_warn_state();
+ /// assert_eq!(guard.state(), OSC94State::Warn);
+ /// ```
+ pub fn set_warn_state(&mut self) {
+ self.msg = OSC94State::Warn;
+ if self.is_support {
+ self.msg.send();
+ }
+ }
+
+ /// Set the process state to Unknown.
+ ///
+ /// Indicates that the process state cannot be determined or has not been defined.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::{OSC94Guard, OSC94State};
+ ///
+ /// let osc94 = OSC94::default();
+ /// let mut guard: OSC94Guard = osc94.get_mut();
+ /// guard.set_unknown_state();
+ /// assert_eq!(guard.state(), OSC94State::Unknown);
+ /// ```
+ pub fn set_unknown_state(&mut self) {
+ self.msg = OSC94State::Unknown;
+ if self.is_support {
+ self.msg.send();
+ }
+ }
+
+ /// Set the progress of the process.
+ ///
+ /// The `progress` parameter should be between `0.0` and `1.0`. `0.0` indicates
+ /// the start of the task, and `1.0` indicates the completion of the task.
+ /// Values outside this range are not clamped, but it is recommended to keep them
+ /// within this range.
+ ///
+ /// # Parameters
+ ///
+ /// * `progress` - The progress value, ranging from `0.0` to `1.0`.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::OSC94Guard;
+ ///
+ /// let osc94 = OSC94::default();
+ /// let mut guard: OSC94Guard = osc94.get_mut();
+ /// guard.set_progress(0.5);
+ /// assert_eq!(guard.progress(), 0.5);
+ /// ```
+ pub fn set_progress(&mut self, progress: f32) {
+ self.msg = OSC94State::Normal(progress);
+ if self.is_support {
+ self.msg.send();
+ }
+ }
+
+ /// Get the current process state.
+ ///
+ /// # Returns
+ ///
+ /// Returns the current [`OSC94State`] value, representing the state of the process.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::{OSC94Guard, OSC94State};
+ ///
+ /// let osc94 = OSC94::default();
+ /// let guard: OSC94Guard = osc94.get_mut();
+ /// assert_eq!(guard.state(), OSC94State::Clean);
+ /// ```
+ #[must_use]
+ pub const fn state(&self) -> OSC94State {
+ self.msg
+ }
+
+ /// Get the current progress value.
+ ///
+ /// Returns the actual progress value only when the state is [`OSC94State::Normal`];
+ /// otherwise returns `0.0`.
+ ///
+ /// # Returns
+ ///
+ /// Returns an `f32` progress value, ranging from `0.0` to `1.0`.
+ ///
+ /// # Example
+ ///
+ /// ```
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::OSC94Guard;
+ ///
+ /// let osc94 = OSC94::default();
+ /// let mut guard: OSC94Guard = osc94.get_mut();
+ /// guard.set_progress(0.25);
+ /// assert_eq!(guard.progress(), 0.25);
+ /// ```
+ #[must_use]
+ pub const fn progress(&self) -> f32 {
+ match self.msg {
+ OSC94State::Normal(progress) => progress,
+ _ => 0.0,
+ }
+ }
+}
+
+impl Drop for OSC94Guard {
+ fn drop(&mut self) {
+ OSC94State::Clean.send();
+ }
+}
diff --git a/mingling/src/osc94/state.rs b/mingling/src/osc94/state.rs
new file mode 100644
index 0000000..1fff7ac
--- /dev/null
+++ b/mingling/src/osc94/state.rs
@@ -0,0 +1,243 @@
+/// `OSC 9;4` protocol message
+///
+/// Used to send task progress notification messages to the terminal via ANSI escape sequences.
+///
+/// This protocol follows the [Windows Terminal Progress Bar Sequences](https://learn.microsoft.com/en-us/windows/terminal/tutorials/progress-bar-sequences) specification.
+/// The status codes (0-4) represent: clear progress, normal, error, indeterminate, and warning states, respectively.
+///
+/// # Examples
+///
+/// ```rust
+/// use mingling::osc94::OSC94State;
+///
+/// // Set progress to 50%
+/// let state = OSC94State::Normal(0.5);
+/// assert_eq!(state.state_code(), 1);
+/// assert_eq!(state.progress(), 50.0);
+///
+/// // Generate escape sequence string
+/// let seq = state.to_escape_sequence();
+/// assert_eq!(seq, "\x1b]9;4;1;50\x07");
+///
+/// // Convert to string (Display implementation)
+/// let s = format!("{state}");
+/// assert_eq!(s, "\x1b]9;4;1;50\x07");
+///
+/// // Convert via From
+/// let s2: String = state.into();
+/// assert_eq!(s2, "\x1b]9;4;1;50\x07");
+///
+/// // Error state
+/// let err = OSC94State::Error;
+/// assert_eq!(err.state_code(), 2);
+/// ```
+///
+/// # Use Cases
+///
+/// In command-line tools or scripts, the [`OSC94State::send`] method can be used to directly send progress notifications to the terminal.
+/// Supported terminals include: `Windows Terminal`, `kitty`, `iTerm2`, `WezTerm`, `foot`, etc.
+///
+/// ```
+/// use mingling::osc94::OSC94State;
+///
+/// // Send progress 100%
+/// OSC94State::Normal(1.0).send();
+/// // Send completion (clear) message
+/// OSC94State::Clean.send();
+/// ```
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum OSC94State {
+ /// Clear/hide progress
+ Clean,
+ /// Normal state, corresponding to status code `1`, carries a progress value (0.0 to 1.0)
+ Normal(f32),
+ /// Error state, corresponding to status code `2`
+ Error,
+ /// Indeterminate state, corresponding to status code `3`
+ Unknown,
+ /// Warning state, corresponding to status code `4`
+ Warn,
+}
+
+impl OSC94State {
+ /// Returns the status code for the `OSC 9;4` protocol.
+ ///
+ /// Status code meanings:
+ /// - `0`: Clear progress (`Clean`)
+ /// - `1`: Normal state (`Normal`)
+ /// - `2`: Error state (`Error`)
+ /// - `3`: Indeterminate state (`Unknown`)
+ /// - `4`: Warning state (`Warn`)
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use mingling::osc94::OSC94State;
+ ///
+ /// assert_eq!(OSC94State::Clean.state_code(), 0);
+ /// assert_eq!(OSC94State::Normal(0.5).state_code(), 1);
+ /// assert_eq!(OSC94State::Error.state_code(), 2);
+ /// assert_eq!(OSC94State::Unknown.state_code(), 3);
+ /// assert_eq!(OSC94State::Warn.state_code(), 4);
+ /// ```
+ ///
+ /// # Return Value
+ ///
+ /// Returns the corresponding status code (`u8` type), ranging from `0` to `4`.
+ #[must_use]
+ pub const fn state_code(&self) -> u8 {
+ match self {
+ Self::Clean => 0,
+ Self::Normal(_) => 1,
+ Self::Error => 2,
+ Self::Unknown => 3,
+ Self::Warn => 4,
+ }
+ }
+
+ /// Returns the progress value (0-100), used for the `Normal` state, clamped to a valid range.
+ ///
+ /// This function converts the progress value (between 0.0 and 1.0) stored in the `Normal` variant
+ /// into a percentage (0 to 100) and rounds it. For non-`Normal` states (such as `Clean`, `Error`,
+ /// `Unknown`, `Warn`), it returns a fixed `0.0`, because only the `Normal` state carries progress information.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use mingling::osc94::OSC94State;
+ ///
+ /// // Progress conversion in normal state
+ /// assert_eq!(OSC94State::Normal(0.5).progress(), 50.0);
+ /// assert_eq!(OSC94State::Normal(1.0).progress(), 100.0);
+ /// assert_eq!(OSC94State::Normal(0.0).progress(), 0.0);
+ ///
+ /// // Out-of-range values are clamped to 0-100
+ /// assert_eq!(OSC94State::Normal(1.5).progress(), 100.0);
+ /// assert_eq!(OSC94State::Normal(-0.5).progress(), 0.0);
+ ///
+ /// // Rounding behavior
+ /// assert_eq!(OSC94State::Normal(0.335).progress(), 34.0);
+ /// assert_eq!(OSC94State::Normal(0.999).progress(), 100.0);
+ ///
+ /// // Non-Normal states return 0.0
+ /// assert_eq!(OSC94State::Clean.progress(), 0.0);
+ /// assert_eq!(OSC94State::Error.progress(), 0.0);
+ /// assert_eq!(OSC94State::Unknown.progress(), 0.0);
+ /// assert_eq!(OSC94State::Warn.progress(), 0.0);
+ /// ```
+ ///
+ /// # Return Value
+ ///
+ /// Returns an `f32` progress percentage, ranging from `0.0` to `100.0` (inclusive).
+ /// For the `Normal` state, returns the rounded result of converting its progress value to a percentage;
+ /// for other states, always returns `0.0`.
+ #[must_use]
+ pub const fn progress(&self) -> f32 {
+ match self {
+ Self::Normal(progress) => (progress.clamp(0.0, 1.0) * 100.0).round(),
+ _ => 0.0,
+ }
+ }
+
+ /// Converts the message to the corresponding `OSC 9;4` escape sequence string.
+ ///
+ /// This method generates an ANSI escape sequence conforming to the
+ /// [Windows Terminal Progress Bar Sequences](https://learn.microsoft.com/en-us/windows/terminal/tutorials/progress-bar-sequences)
+ /// protocol based on the current state, in the format `\x1b]9;4;{status_code};{progress}\x07`.
+ ///
+ /// Escape sequence format description:
+ /// - `\x1b]`: ESC character followed by `]`, marking the start of an OSC (Operating System Command) sequence.
+ /// - `9;4`: Indicates the `OSC 9;4` protocol (task progress notification).
+ /// - `{status_code}`: Task status, ranging from `0` (clear), `1` (normal), `2` (error), `3` (indeterminate), to `4` (warning).
+ /// - `{progress}`: Task progress percentage (0-100), only meaningful for the `Normal` state.
+ /// - `\x07`: BEL character, marking the end of the OSC sequence.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use mingling::osc94::OSC94State;
+ ///
+ /// // Clear progress
+ /// let clean = OSC94State::Clean;
+ /// assert_eq!(clean.to_escape_sequence(), "\x1b]9;4;0;0\x07");
+ ///
+ /// // Normal state, progress 50%
+ /// let normal = OSC94State::Normal(0.5);
+ /// assert_eq!(normal.to_escape_sequence(), "\x1b]9;4;1;50\x07");
+ ///
+ /// // Normal state, progress 100%
+ /// let complete = OSC94State::Normal(1.0);
+ /// assert_eq!(complete.to_escape_sequence(), "\x1b]9;4;1;100\x07");
+ ///
+ /// // Error state
+ /// let error = OSC94State::Error;
+ /// assert_eq!(error.to_escape_sequence(), "\x1b]9;4;2;0\x07");
+ ///
+ /// // Indeterminate state
+ /// let unknown = OSC94State::Unknown;
+ /// assert_eq!(unknown.to_escape_sequence(), "\x1b]9;4;3;0\x07");
+ ///
+ /// // Warning state
+ /// let warn = OSC94State::Warn;
+ /// assert_eq!(warn.to_escape_sequence(), "\x1b]9;4;4;0\x07");
+ /// ```
+ ///
+ /// # Return Value
+ ///
+ /// Returns a `String` containing an ANSI escape sequence conforming to the `OSC 9;4` protocol standard.
+ /// This string can be directly output to a terminal that supports this protocol (such as `Windows Terminal`,
+ /// `kitty`, `iTerm2`, `WezTerm`, `foot`, etc.) to display a task progress notification.
+ #[must_use]
+ pub fn to_escape_sequence(&self) -> String {
+ format!("\x1b]9;4;{};{}\x07", self.state_code(), self.progress())
+ }
+
+ /// Sends the OSC 9;4 message to the terminal via stdout.
+ ///
+ /// This method outputs the escape sequence of the current state to standard output and flushes the buffer,
+ /// allowing terminals that support the
+ /// [Windows Terminal Progress Bar Sequences](https://learn.microsoft.com/en-us/windows/terminal/tutorials/progress-bar-sequences)
+ /// protocol to display the corresponding task progress notification.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use mingling::osc94::OSC94State;
+ ///
+ /// // Send normal state, progress 50%
+ /// OSC94State::Normal(0.5).send();
+ ///
+ /// // Send error state
+ /// OSC94State::Error.send();
+ ///
+ /// // Send clear progress message
+ /// OSC94State::Clean.send();
+ /// ```
+ ///
+ /// # Panics
+ ///
+ /// Panics if the stdout stream cannot be flushed.
+ pub fn send(&self) {
+ use std::io::Write;
+ print!("{}", self.to_escape_sequence());
+ std::io::stdout().flush().unwrap();
+ }
+}
+
+impl std::fmt::Display for OSC94State {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}", self.to_escape_sequence())
+ }
+}
+
+impl From<OSC94State> for String {
+ fn from(msg: OSC94State) -> Self {
+ msg.to_escape_sequence()
+ }
+}
+
+impl From<&OSC94State> for String {
+ fn from(msg: &OSC94State) -> Self {
+ msg.to_escape_sequence()
+ }
+}
diff --git a/mingling/src/res/confirmer.rs b/mingling/src/res/confirmer.rs
index d92e2a0..146a2e8 100644
--- a/mingling/src/res/confirmer.rs
+++ b/mingling/src/res/confirmer.rs
@@ -1,5 +1,7 @@
use std::io::{BufRead, Write};
+use crate::confirm::{ConfirmerCount, ConfirmerPredicate};
+
/// A confirmer for interactive confirmation.
///
/// This structure caches the confirmed state to avoid repeated prompts.
@@ -23,7 +25,8 @@ use std::io::{BufRead, Write};
/// # Examples
///
/// ```
-/// use mingling::res::{Confirmer, YesConfirm};
+/// use mingling::res::Confirmer;
+/// use mingling::confirm::YesConfirm;
///
/// // In actual use, obtain the registered confirmer through the resource injection system
/// let confirmer = Confirmer::new_confirmed();
@@ -57,7 +60,8 @@ impl Confirmer {
/// # Examples
///
/// ```
- /// use mingling::res::{Confirmer, YesConfirm};
+ /// use mingling::res::Confirmer;
+ /// use mingling::confirm::YesConfirm;
///
/// let confirmer = Confirmer::new_confirmed();
/// assert!(confirmer.ask::<YesConfirm>("Continue? [y/n] "));
@@ -76,7 +80,8 @@ impl Confirmer {
/// # Examples
///
/// ```
- /// use mingling::res::{Confirmer, YesConfirm};
+ /// use mingling::res::Confirmer;
+ /// use mingling::confirm::YesConfirm;
///
/// let mut confirmer = Confirmer::new();
/// confirmer.set_confirmed();
@@ -103,7 +108,8 @@ impl Confirmer {
/// # Examples
///
/// ```
- /// use mingling::res::{Confirmer, YesConfirm};
+ /// use mingling::res::Confirmer;
+ /// use mingling::confirm::YesConfirm;
///
/// let confirmer = Confirmer::new_confirmed();
/// let confirmed = confirmer.ask::<YesConfirm>("Delete this file? [y/n] ");
@@ -135,7 +141,8 @@ impl Confirmer {
/// # Examples
///
/// ```
- /// use mingling::res::{Confirmer, YesConfirm};
+ /// use mingling::res::Confirmer;
+ /// use mingling::confirm::YesConfirm;
///
/// let confirmer = Confirmer::new_confirmed();
/// let confirmed = confirmer.try_ask::<YesConfirm>("Confirm execution? [y/n] ", 3);
@@ -175,94 +182,3 @@ impl Confirmer {
}
}
}
-
-/// Specifies the maximum number of attempts for a confirmation prompt.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum ConfirmerCount {
- /// Loop indefinitely until the user gives a parseable answer.
- Loop,
- /// Ask at most the specified number of times.
- Max(usize),
-}
-
-macro_rules! impl_from_for_confirmer_count {
- ($($t:ty),*) => {
- $(
- impl From<$t> for ConfirmerCount {
- fn from(n: $t) -> Self {
- if n == 0 {
- ConfirmerCount::Loop
- } else {
- match usize::try_from(n) {
- Ok(max) => ConfirmerCount::Max(max),
- Err(_) => ConfirmerCount::Max(usize::MAX),
- }
- }
- }
- }
- )*
- };
-}
-
-impl_from_for_confirmer_count!(
- i8, i16, i32, i64, i128, isize, u8, u16, u32, u64, u128, usize
-);
-
-/// Defines how to parse user confirmation input.
-///
-/// A type implementing this trait determines which user input strings are treated as "yes" or "no".
-pub trait ConfirmerPredicate {
- /// Parses the user's input string, returning whether it is "yes".
- ///
- /// Returns `Some(true)` for yes, `Some(false)` for no,
- /// and `None` if the input cannot be parsed (requiring re-entry).
- fn is_yes(str: &str) -> Option<bool>;
-}
-
-/// A `ConfirmerPredicate` implementation that accepts "y"/"yes" as yes and "n"/"no" as no.
-///
-/// Input comparison is case-insensitive and automatically trims leading/trailing whitespace.
-///
-/// # Examples
-///
-/// ```
-/// use mingling::res::{Confirmer, YesConfirm};
-///
-/// let confirmer = Confirmer::default();
-/// let confirmed = confirmer.ask::<YesConfirm>("Continue? [y/n] ");
-/// ```
-pub struct YesConfirm;
-
-/// A `ConfirmerPredicate` implementation that accepts "true"/"t" as yes and "false"/"f" as no.
-///
-/// Input comparison is case-insensitive and automatically trims leading/trailing whitespace.
-///
-/// # Examples
-///
-/// ```
-/// use mingling::res::{Confirmer, TrueConfirm};
-///
-/// let confirmer = Confirmer::default();
-/// let confirmed = confirmer.ask::<TrueConfirm>("Enable this feature? [true/false] ");
-/// ```
-pub struct TrueConfirm;
-
-impl ConfirmerPredicate for YesConfirm {
- fn is_yes(str: &str) -> Option<bool> {
- match str.trim().to_lowercase().as_str() {
- "y" | "yes" => Some(true),
- "n" | "no" => Some(false),
- _ => None,
- }
- }
-}
-
-impl ConfirmerPredicate for TrueConfirm {
- fn is_yes(str: &str) -> Option<bool> {
- match str.trim().to_lowercase().as_str() {
- "true" | "t" => Some(true),
- "false" | "f" => Some(false),
- _ => None,
- }
- }
-}
diff --git a/mingling/src/res/osc94.rs b/mingling/src/res/osc94.rs
index 3c80290..8e03b21 100644
--- a/mingling/src/res/osc94.rs
+++ b/mingling/src/res/osc94.rs
@@ -1,5 +1,4 @@
-mod state;
-pub use state::*;
+use crate::osc94::{OSC94Guard, OSC94State};
/// Process `OSC 9;4` status.
///
@@ -25,7 +24,8 @@ pub use state::*;
/// # Example
///
/// ```
-/// use mingling::res::{OSC94, OSC94State};
+/// use mingling::res::OSC94;
+/// use mingling::osc94::OSC94State;
///
/// let osc94 = OSC94::default();
/// let mut guard = osc94.get_mut();
@@ -52,7 +52,8 @@ impl OSC94 {
/// # Example
///
/// ```
- /// use mingling::res::{OSC94, OSC94State};
+ /// use mingling::res::OSC94;
+ /// use mingling::osc94::OSC94State;
///
/// let osc94 = OSC94::default();
/// let guard = osc94.get_mut();
@@ -66,199 +67,3 @@ impl OSC94 {
}
}
}
-
-/// A guard for modifying process state.
-///
-/// Obtained via [`OSC94::get_mut`]. When the guard is dropped, the process state is
-/// automatically restored to `OS94State::Clean`, so no manual cleanup is needed.
-///
-/// # Example
-///
-/// Create a guard via [`OSC94`], and the state is automatically restored to Clean
-/// when the guard is dropped:
-///
-/// ```
-/// use mingling::res::OSC94;
-///
-/// let osc94 = OSC94::default();
-/// {
-/// let mut guard = osc94.get_mut();
-/// guard.set_progress(0.5);
-/// // When leaving this scope, the guard is dropped and the process state is automatically restored to Clean
-/// }
-/// ```
-pub struct OSC94Guard {
- pub(crate) is_support: bool,
- msg: OSC94State,
-}
-
-impl OSC94Guard {
- /// Set the process state to Clean.
- ///
- /// Indicates that the process has finished or is in a normal, problem-free state.
- ///
- /// # Example
- ///
- /// ```
- /// use mingling::res::{OSC94, OSC94State};
- ///
- /// let osc94 = OSC94::default();
- /// let mut guard = osc94.get_mut();
- /// guard.set_progress(0.5);
- /// guard.set_clean_state();
- /// assert_eq!(guard.state(), OSC94State::Clean);
- /// ```
- pub fn set_clean_state(&mut self) {
- self.msg = OSC94State::Clean;
- if self.is_support {
- self.msg.send();
- }
- }
-
- /// Set the process state to Error.
- ///
- /// Indicates that an error occurred during process execution.
- ///
- /// # Example
- ///
- /// ```
- /// use mingling::res::{OSC94, OSC94State};
- ///
- /// let osc94 = OSC94::default();
- /// let mut guard = osc94.get_mut();
- /// guard.set_error_state();
- /// assert_eq!(guard.state(), OSC94State::Error);
- /// ```
- pub fn set_error_state(&mut self) {
- self.msg = OSC94State::Error;
- if self.is_support {
- self.msg.send();
- }
- }
-
- /// Set the process state to Warn.
- ///
- /// Indicates that a warning occurred during process execution, but it has not
- /// reached the level of an error.
- ///
- /// # Example
- ///
- /// ```
- /// use mingling::res::{OSC94, OSC94State};
- ///
- /// let osc94 = OSC94::default();
- /// let mut guard = osc94.get_mut();
- /// guard.set_warn_state();
- /// assert_eq!(guard.state(), OSC94State::Warn);
- /// ```
- pub fn set_warn_state(&mut self) {
- self.msg = OSC94State::Warn;
- if self.is_support {
- self.msg.send();
- }
- }
-
- /// Set the process state to Unknown.
- ///
- /// Indicates that the process state cannot be determined or has not been defined.
- ///
- /// # Example
- ///
- /// ```
- /// use mingling::res::{OSC94, OSC94State};
- ///
- /// let osc94 = OSC94::default();
- /// let mut guard = osc94.get_mut();
- /// guard.set_unknown_state();
- /// assert_eq!(guard.state(), OSC94State::Unknown);
- /// ```
- pub fn set_unknown_state(&mut self) {
- self.msg = OSC94State::Unknown;
- if self.is_support {
- self.msg.send();
- }
- }
-
- /// Set the progress of the process.
- ///
- /// The `progress` parameter should be between `0.0` and `1.0`. `0.0` indicates
- /// the start of the task, and `1.0` indicates the completion of the task.
- /// Values outside this range are not clamped, but it is recommended to keep them
- /// within this range.
- ///
- /// # Parameters
- ///
- /// * `progress` - The progress value, ranging from `0.0` to `1.0`.
- ///
- /// # Example
- ///
- /// ```
- /// use mingling::res::OSC94;
- ///
- /// let osc94 = OSC94::default();
- /// let mut guard = osc94.get_mut();
- /// guard.set_progress(0.5);
- /// assert_eq!(guard.progress(), 0.5);
- /// ```
- pub fn set_progress(&mut self, progress: f32) {
- self.msg = OSC94State::Normal(progress);
- if self.is_support {
- self.msg.send();
- }
- }
-
- /// Get the current process state.
- ///
- /// # Returns
- ///
- /// Returns the current [`OSC94State`] value, representing the state of the process.
- ///
- /// # Example
- ///
- /// ```
- /// use mingling::res::{OSC94, OSC94State};
- ///
- /// let osc94 = OSC94::default();
- /// let guard = osc94.get_mut();
- /// assert_eq!(guard.state(), OSC94State::Clean);
- /// ```
- #[must_use]
- pub const fn state(&self) -> OSC94State {
- self.msg
- }
-
- /// Get the current progress value.
- ///
- /// Returns the actual progress value only when the state is [`OSC94State::Normal`];
- /// otherwise returns `0.0`.
- ///
- /// # Returns
- ///
- /// Returns an `f32` progress value, ranging from `0.0` to `1.0`.
- ///
- /// # Example
- ///
- /// ```
- /// use mingling::res::OSC94;
- ///
- /// let osc94 = OSC94::default();
- /// let mut guard = osc94.get_mut();
- /// guard.set_progress(0.25);
- /// assert_eq!(guard.progress(), 0.25);
- /// ```
- #[must_use]
- pub const fn progress(&self) -> f32 {
- match self.msg {
- OSC94State::Normal(progress) => progress,
- _ => 0.0,
- }
- }
-}
-
-impl Drop for OSC94Guard {
- fn drop(&mut self) {
- if self.is_support {
- OSC94State::Clean.send();
- }
- }
-}
diff --git a/mingling/src/res/osc94/state.rs b/mingling/src/res/osc94/state.rs
deleted file mode 100644
index c3d2bdf..0000000
--- a/mingling/src/res/osc94/state.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-/// `OSC 9;4` 协议消息
-///
-/// 用于通过 ANSI 转义序列向终端发送任务进度通知消息
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum OSC94State {
- /// 清除/隐藏进度(任务完成时使用),对应状态码 `0`
- Clean,
- /// 正常状态,对应状态码 `1`,需要配合进度值(0-100)
- Normal(f32),
- /// 错误状态,对应状态码 `2`(通常显示为红色)
- Error,
- /// 不确定状态,对应状态码 `3`(显示为无限循环的动画,用于进度未知的任务)
- Unknown,
- /// 警告状态,对应状态码 `4`(通常显示为黄色)
- Warn,
-}
-
-impl OSC94State {
- /// Returns the state code for the `OSC 9;4` protocol.
- #[must_use]
- pub const fn state_code(&self) -> u8 {
- match self {
- Self::Clean => 0,
- Self::Normal(_) => 1,
- Self::Error => 2,
- Self::Unknown => 3,
- Self::Warn => 4,
- }
- }
-
- /// Returns the progress value (0-100) for the `Normal` state, clamped to the valid range.
- #[must_use]
- pub const fn progress(&self) -> f32 {
- match self {
- Self::Normal(progress) => (progress.clamp(0.0, 1.0) * 100.0).round(),
- _ => 0.0,
- }
- }
-
- /// Converts the message into the corresponding `OSC 9;4` escape sequence string.
- #[must_use]
- pub fn to_escape_sequence(&self) -> String {
- format!("\x1b]9;4;{};{}\x07", self.state_code(), self.progress())
- }
-
- /// Sends the OSC 9;4 message to the terminal via stdout.
- ///
- /// # Panics
- ///
- /// Panics if the stdout stream cannot be flushed.
- pub fn send(&self) {
- use std::io::Write;
- print!("{}", self.to_escape_sequence());
- std::io::stdout().flush().unwrap();
- }
-}
-
-impl std::fmt::Display for OSC94State {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
- write!(f, "{}", self.to_escape_sequence())
- }
-}
-
-impl From<OSC94State> for String {
- fn from(msg: OSC94State) -> Self {
- msg.to_escape_sequence()
- }
-}
-
-impl From<&OSC94State> for String {
- fn from(msg: &OSC94State) -> Self {
- msg.to_escape_sequence()
- }
-}