support /p too

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/api.rs b/src/api.rs
index 7a59ca2cb786f400bc88b819ba16a880904cacbb..64632f31b93058e772b6604cba068b2ae7e99a79 100644 (file)
--- a/src/api.rs
+++ b/src/api.rs
@@ -36,6 +36,20 @@ impl PresentationLayout {
   }
 }
 
+pub struct AbbrevPresentationLayout(pub PresentationLayout);
+
+impl<'r> FromParam<'r> for AbbrevPresentationLayout {
+  type Error = ();
+  #[throws(Self::Error)]
+  fn from_param(param: &'r RawStr) -> Self {
+    AbbrevPresentationLayout(match param.as_str() {
+      "p "=> PL::Portrait,
+      "l" => PL::Landscape,
+      _ => throw!(())
+    })
+  }
+}
+
 #[derive(Debug,Serialize,Deserialize)]
 struct ApiPiece<O : ApiPieceOp> {
   ctoken : RawToken,

diff --git a/src/bin/daemon-otter.rs b/src/bin/daemon-otter.rs
index b681f4ff1b064c61338ad905391f0d7ac8431683..ab337ef4a5f7ee40cc3f7b807fbdfadd1519e656 100644 (file)
--- a/src/bin/daemon-otter.rs
+++ b/src/bin/daemon-otter.rs
@@ -66,10 +66,11 @@ fn loading_p(ptoken: WholeQueryString) -> Template {
   loading(PresentationLayout::Portrait, ptoken)?
 }
 // xxx also do p, make it an account/player property
-#[get("/l")]
+#[get("/<layout>")]
 #[throws(OE)]
-fn loading_l(ptoken: WholeQueryString) -> Template {
-  loading(PresentationLayout::Landscape, ptoken)?
+fn loading_l(layout: AbbrevPresentationLayout, ptoken: WholeQueryString)
+             -> Template {
+  loading(layout.0, ptoken)?
 }
 
 #[throws(OE)]

diff --git a/src/imports.rs b/src/imports.rs
index d53231217195c16ef2c8dc931dbd2a7796cc526c..cf5d5c97cd57fbde017be6a977eaeb9a89c5d9be 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -126,7 +126,7 @@ pub use crate::slotmap_slot_idx::*;
 pub use crate::cmdlistener::*;
 pub use crate::mgmtchannel::*;
 pub use crate::api::{Lens,TransparentLens,ApiPieceOpError};
-pub use crate::api::{PresentationLayout};
+pub use crate::api::{PresentationLayout,AbbrevPresentationLayout};
 pub use crate::utils::*;
 pub use crate::spec::*;
 pub use crate::debugreader::DebugReader;