Extract ApiPath struct

RReverser · Sep 30, 2024 · b01873f · b01873f
1 parent f12f155
commit b01873f
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/server/mod.rs b/src/server/mod.rs
@@ -26,6 +26,7 @@ use axum::Router;
 use futures::future::{BoxFuture, Future, FutureExt};
 use net_literals::addr;
 use sailfish::TemplateOnce;
+use serde::Deserialize;
 use std::collections::BTreeMap;
 use std::net::SocketAddr;
 use std::sync::Arc;
@@ -144,6 +145,13 @@ impl BoundServer {
     }
 }
 
+#[derive(Deserialize)]
+struct ApiPath {
+    device_type: DevicePath,
+    device_number: usize,
+    action: String,
+}
+
 impl Server {
     /// Binds the Alpaca and discovery servers to local ports.
     pub async fn bind(self) -> eyre::Result<BoundServer> {
@@ -286,11 +294,11 @@ impl Server {
             .route(
                 "/api/v1/:device_type/:device_number/:action",
                 axum::routing::any(
-                    move |Path((DevicePath(device_type), device_number, action)): Path<(
-                        DevicePath,
-                        usize,
-                        String,
-                    )>,
+                    move |Path(ApiPath {
+                              device_type: DevicePath(device_type),
+                              device_number,
+                              action,
+                          }),
                           #[cfg(feature = "camera")] headers: http::HeaderMap,
                           server_handler: ServerHandler| async move {
                         #[cfg(feature = "camera")]