From ec76bbe5398f51ffa55bfd315b30c0a07245d4e6 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 22 Jan 2023 13:56:06 +0100 Subject: this is *horrible* --- server/src/routes/ui/mod.rs | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) (limited to 'server/src/routes/ui/mod.rs') diff --git a/server/src/routes/ui/mod.rs b/server/src/routes/ui/mod.rs index 8a3bc4e..e062a68 100644 --- a/server/src/routes/ui/mod.rs +++ b/server/src/routes/ui/mod.rs @@ -1,34 +1,48 @@ -use self::layout::Layout; use markup::Render; use rocket::{ + futures::FutureExt, http::ContentType, response::{self, Responder}, Request, Response, }; -use std::io::Cursor; +use std::{future::Future, io::Cursor, pin::Pin}; +use tokio::io::AsyncRead; +pub mod account; pub mod error; pub mod home; pub mod layout; pub mod node; -pub mod style; pub mod player; -pub mod account; +pub mod style; -pub struct HtmlTemplate(pub String, pub T); +pub struct HtmlTemplate<'a>(pub markup::DynRender<'a>); -impl<'r, T: Render> Responder<'r, 'static> for HtmlTemplate { - fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> { +impl<'r> Responder<'r, 'static> for HtmlTemplate<'_> { + fn respond_to(self, req: &'r Request<'_>) -> response::Result<'static> { let mut out = String::new(); - Layout { - title: self.0, - main: self.1, - } - .render(&mut out) - .unwrap(); + self.0.render(&mut out).unwrap(); Response::build() .header(ContentType::HTML) .streamed_body(Cursor::new(out)) .ok() } } + +pub struct Defer(Pin + Send>>); + +impl AsyncRead for Defer { + fn poll_read( + mut self: std::pin::Pin<&mut Self>, + cx: &mut std::task::Context<'_>, + buf: &mut tokio::io::ReadBuf<'_>, + ) -> std::task::Poll> { + match self.0.poll_unpin(cx) { + std::task::Poll::Ready(r) => { + buf.put_slice(r.as_bytes()); + std::task::Poll::Ready(Ok(())) + } + std::task::Poll::Pending => std::task::Poll::Pending, + } + } +} -- cgit v1.2.3-70-g09d2