From d1630b2f2d8dd2fa7087477e5247f53b82897953 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 6 Jul 2020 16:20:20 +0100 Subject: [PATCH] prep for api internal refact --- src/bin/server.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/bin/server.rs b/src/bin/server.rs index 7c969b60..77ec29b8 100644 --- a/src/bin/server.rs +++ b/src/bin/server.rs @@ -114,15 +114,25 @@ fn session(form : Json) -> Result { } #[derive(Debug,Serialize,Deserialize)] -struct ApiGrab { +struct ApiPiece { ctoken : String, piece : VisiblePieceId, gen : Generation, cseq : ClientSequence, + #[serde(flatten)] + op : O, } +#[derive(Debug,Serialize,Deserialize)] +struct ApiPieceGrab { +} +trait ApiPieceOp { +} +impl ApiPieceOp for ApiPieceGrab { } + #[post("/_/api/grab", format="json", data="
")] #[throws(OE)] -fn api_grab(form : Json) -> impl response::Responder<'static> { +fn api_grab(form : Json>) + -> impl response::Responder<'static> { let iad = lookup_token(&form.ctoken)?; let client = iad.ident; let mut g = iad.g.lock()?; -- 2.30.2