eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 13:06:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(command_parser): simplify how tokens are defined in commands

Browse source
This commit is contained in:
dusk 2025-01-24 04:08:59 +09:00
parent f804e7629f
commit 071db3d6d6
No known key found for this signature in database
9 changed files with 114 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/command_parser/src/parameter.rs
View file

@ -2,6 +2,8 @@ use std::{fmt::Debug, str::FromStr};
use smol_str::SmolStr;
use crate::token::Token;
#[derive(Debug, Clone)]
pub enum ParameterValue {
OpaqueString(String),
@ -180,10 +182,7 @@ impl FromStr for PrivacyLevelKind {
}
}
pub const ENABLE: [&str; 5] = ["on", "yes", "true", "enable", "enabled"];
pub const DISABLE: [&str; 5] = ["off", "no", "false", "disable", "disabled"];
#[derive(Debug, Clone, Eq, Hash, PartialEq)]
#[derive(Debug, Clone, Copy, Eq, Hash, PartialEq)]
pub enum Toggle {
On,
Off,
@ -193,10 +192,20 @@ impl FromStr for Toggle {
type Err = SmolStr;
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
ref s if ENABLE.contains(s) => Ok(Self::On),
ref s if DISABLE.contains(s) => Ok(Self::Off),
_ => Err("invalid toggle, must be on/off".into()),
let matches_self =
|toggle: &Self| matches!(Token::from(*toggle).try_match(Some(s)), Some(Ok(None)));
[Self::On, Self::Off]
.into_iter()
.find(matches_self)
.ok_or_else(|| SmolStr::new("invalid toggle, must be on/off"))
}
}
impl From<Toggle> for Token {
fn from(toggle: Toggle) -> Self {
match toggle {
Toggle::On => Self::from(("on", ["yes", "true", "enable", "enabled"])),
Toggle::Off => Self::from(("off", ["no", "false", "disable", "disabled"])),
}
}
}
@ -209,5 +218,3 @@ impl Into<bool> for Toggle {
}
}
}
pub const RESET: [&str; 3] = ["reset", "clear", "default"];