From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 6 Jul 2020 15:20:20 +0000 (+0100)
Subject: prep for api internal refact
X-Git-Tag: otter-0.2.0~1426
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d1630b2f2d8dd2fa7087477e5247f53b82897953;p=otter.git

prep for api internal refact
---

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<SessionForm>) -> Result<Template,OE> {
 }
 
 #[derive(Debug,Serialize,Deserialize)]
-struct ApiGrab {
+struct ApiPiece<O : ApiPieceOp> {
   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="<form>")]
 #[throws(OE)]
-fn api_grab(form : Json<ApiGrab>) -> impl response::Responder<'static> {
+fn api_grab(form : Json<ApiPiece<ApiPieceGrab>>)
+            -> impl response::Responder<'static> {
   let iad = lookup_token(&form.ctoken)?;
   let client = iad.ident;
   let mut g = iad.g.lock()?;