refactor(commands): remove Reset as a parameter type

This commit is contained in:
dusk 2025-01-15 00:21:11 +09:00
parent 6c54551a9e
commit 2a063442ea
No known key found for this signature in database
6 changed files with 6 additions and 17 deletions

View file

@ -51,14 +51,4 @@ public static class ContextParametersExt
param => (param as Parameter.Toggle)?.value param => (param as Parameter.Toggle)?.value
); );
} }
// this can never really be false (either it's present and is true or it's not present)
// but we keep it nullable for consistency with the other methods
public static async Task<bool?> ParamResolveReset(this Context ctx, string param_name)
{
return await ctx.Parameters.ResolveParameter<bool?>(
ctx, param_name,
param => param is Parameter.Reset
);
}
} }

View file

@ -13,7 +13,6 @@ public abstract record Parameter()
public record PrivacyLevel(string level): Parameter; public record PrivacyLevel(string level): Parameter;
public record Toggle(bool value): Parameter; public record Toggle(bool value): Parameter;
public record Opaque(string value): Parameter; public record Opaque(string value): Parameter;
public record Reset(): Parameter;
} }
public class Parameters public class Parameters
@ -80,8 +79,6 @@ public class Parameters
return new Parameter.Toggle(toggle.toggle); return new Parameter.Toggle(toggle.toggle);
case uniffi.commands.Parameter.OpaqueString opaque: case uniffi.commands.Parameter.OpaqueString opaque:
return new Parameter.Opaque(opaque.raw); return new Parameter.Opaque(opaque.raw);
case uniffi.commands.Parameter.Reset _:
return new Parameter.Reset();
} }
return null; return null;
} }

View file

@ -230,7 +230,7 @@ public class Config
public async Task EditAutoproxyTimeout(Context ctx) public async Task EditAutoproxyTimeout(Context ctx)
{ {
var _newTimeout = await ctx.ParamResolveOpaque("timeout"); var _newTimeout = await ctx.ParamResolveOpaque("timeout");
var _reset = await ctx.ParamResolveReset("reset"); var _reset = await ctx.ParamResolveToggle("reset");
var _toggle = await ctx.ParamResolveToggle("toggle"); var _toggle = await ctx.ParamResolveToggle("toggle");
Duration? newTimeout; Duration? newTimeout;

View file

@ -14,7 +14,6 @@ interface Parameter {
PrivacyLevel(string level); PrivacyLevel(string level);
OpaqueString(string raw); OpaqueString(string raw);
Toggle(boolean toggle); Toggle(boolean toggle);
Reset();
}; };
dictionary ParsedCommand { dictionary ParsedCommand {
string command_ref; string command_ref;

View file

@ -49,7 +49,6 @@ pub enum Parameter {
PrivacyLevel { level: String }, PrivacyLevel { level: String },
OpaqueString { raw: String }, OpaqueString { raw: String },
Toggle { toggle: bool }, Toggle { toggle: bool },
Reset,
} }
#[derive(Debug)] #[derive(Debug)]

View file

@ -198,7 +198,11 @@ impl Token {
Err(_) => None, Err(_) => None,
}, },
Self::Reset(param_name) => match Reset::from_str(input) { Self::Reset(param_name) => match Reset::from_str(input) {
Ok(_) => TokenMatchValue::new_match_param(input, param_name, Parameter::Reset), Ok(_) => TokenMatchValue::new_match_param(
input,
param_name,
Parameter::Toggle { toggle: true },
),
Err(_) => None, Err(_) => None,
}, },
// don't add a _ match here! // don't add a _ match here!