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

refactor(commands): rewrite how parameters are handled so they work same across cmd params / flag params, and make it easier to add new parameters

Browse source
This commit is contained in:
dusk 2025-01-15 03:52:32 +09:00
parent a1f7656276
commit 07541d9926
No known key found for this signature in database
8 changed files with 443 additions and 363 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/commands/src/commands.rs
View file

@ -22,11 +22,7 @@ use std::fmt::{Debug, Display};
use smol_str::SmolStr;
use crate::{
command,
flag::{Flag, FlagValue},
token::Token,
};
use crate::{any, command, flag::Flag, parameter::*, token::Token};
#[derive(Debug, Clone)]
pub struct Command {
@ -51,17 +47,7 @@ impl Command {
let mut was_parameter = true;
for (idx, token) in tokens.iter().enumerate().rev() {
match token {
Token::OpaqueRemainder(_)
| Token::OpaqueString(_)
| Token::MemberRef(_)
| Token::MemberPrivacyTarget(_)
| Token::SystemRef(_)
| Token::PrivacyLevel(_)
| Token::Toggle(_)
| Token::Enable(_)
| Token::Disable(_)
| Token::Reset(_)
| Token::Any(_) => {
Token::Parameter(_, _) | Token::Any(_) => {
parse_flags_before = idx;
was_parameter = true;
}
@ -92,7 +78,7 @@ impl Command {
self
}
pub fn value_flag(mut self, name: impl Into<SmolStr>, value: FlagValue) -> Self {
pub fn value_flag(mut self, name: impl Into<SmolStr>, value: impl Parameter + 'static) -> Self {
self.flags.push(Flag::new(name).with_value(value));
self
}