studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add handler_prefix to admin_command_dispatch for method dedup purposes.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-09-27 09:35:15 +00:00
parent fbcf4ba4f3
commit 41ff81f843
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/macros/admin.rs
View File

@@ -4,7 +4,10 @@ use proc_macro2::TokenStream as TokenStream2;
use quote::{ToTokens, quote}; use quote::{ToTokens, quote};
use syn::{Attribute, Error, Fields, Ident, ItemEnum, ItemFn, Meta, Variant, parse_quote}; use syn::{Attribute, Error, Fields, Ident, ItemEnum, ItemFn, Meta, Variant, parse_quote};
use crate::{Result, utils::camel_to_snake_string}; use crate::{
Result,
utils::{camel_to_snake_string, get_simple_settings},
};
pub(super) fn command(mut item: ItemFn, _args: &[Meta]) -> Result<TokenStream> { pub(super) fn command(mut item: ItemFn, _args: &[Meta]) -> Result<TokenStream> {
let attr: Attribute = parse_quote! { let attr: Attribute = parse_quote! {
@@ -15,13 +18,20 @@ pub(super) fn command(mut item: ItemFn, _args: &[Meta]) -> Result<TokenStream> {
Ok(item.into_token_stream().into()) Ok(item.into_token_stream().into())
} }
pub(super) fn command_dispatch(item: ItemEnum, _args: &[Meta]) -> Result<TokenStream> { pub(super) fn command_dispatch(item: ItemEnum, args: &[Meta]) -> Result<TokenStream> {
let name = &item.ident; let name = &item.ident;
let opts = get_simple_settings(args);
let prefix = opts
.get("handler_prefix")
.map(|s| format!("{s}_"))
.unwrap_or_default();
let arm: Vec<TokenStream2> = item let arm: Vec<TokenStream2> = item
.variants .variants
.iter() .iter()
.map(dispatch_arm) .map(|variant| dispatch_arm(variant, prefix.as_str()))
.try_collect()?; .try_collect()?;
let switch = quote! { let switch = quote! {
#[allow(clippy::large_stack_frames)] //TODO: fixme #[allow(clippy::large_stack_frames)] //TODO: fixme
pub(super) async fn process( pub(super) async fn process(
@@ -42,9 +52,10 @@ pub(super) fn command_dispatch(item: ItemEnum, _args: &[Meta]) -> Result<TokenSt
.into()) .into())
} }
fn dispatch_arm(v: &Variant) -> Result<TokenStream2> { fn dispatch_arm(v: &Variant, prefix: &str) -> Result<TokenStream2> {
let name = &v.ident; let name = &v.ident;
let target = camel_to_snake_string(&format!("{name}")); let target = camel_to_snake_string(&format!("{name}"));
let target = format!("{prefix}{target}");
let handler = Ident::new(&target, Span::call_site().into()); let handler = Ident::new(&target, Span::call_site().into());
let res = match &v.fields { let res = match &v.fields {
| Fields::Named(fields) => { | Fields::Named(fields) => {
@@ -52,6 +63,7 @@ fn dispatch_arm(v: &Variant) -> Result<TokenStream2> {
.named .named
.iter() .iter()
.filter_map(|f| f.ident.as_ref()); .filter_map(|f| f.ident.as_ref());
let arg = field.clone(); let arg = field.clone();
quote! { quote! {
#name { #( #field ),* } => { #name { #( #field ),* } => {
@@ -63,6 +75,7 @@ fn dispatch_arm(v: &Variant) -> Result<TokenStream2> {
let Some(ref field) = fields.unnamed.first() else { let Some(ref field) = fields.unnamed.first() else {
return Err(Error::new(Span::call_site().into(), "One unnamed field required")); return Err(Error::new(Span::call_site().into(), "One unnamed field required"));
}; };
quote! { quote! {
#name ( #field ) => { #name ( #field ) => {
Box::pin(#handler::process(#field, context)).await Box::pin(#handler::process(#field, context)).await