3 files changed, 35 insertions, 55 deletions

diff --git a/src/frontend/pages/home.rs b/src/frontend/pages/home.rs
index bb0eb59..3595c19 100644
--- a/src/frontend/pages/home.rs
+++ b/src/frontend/pages/home.rs
@@ -2,10 +2,10 @@ use crate::{
     frontend::pages::{layout::Layout, HtmlTemplate},
     AppState,
 };
-use actix_web::{get, web::Data, Responder};
+use rocket::{get, State};
 
 #[get("/")]
-pub async fn page_home(state: Data<AppState>) -> impl Responder {
+pub async fn page_home(state: &State<AppState>) -> HtmlTemplate<impl markup::Render> {
     HtmlTemplate(Layout {
         title: String::from("Home"),
         main: markup::new! {
diff --git a/src/frontend/pages/mod.rs b/src/frontend/pages/mod.rs
index 0e54a9a..46e2067 100644
--- a/src/frontend/pages/mod.rs
+++ b/src/frontend/pages/mod.rs
@@ -1,60 +1,40 @@
-use actix_web::{
-    body::BoxBody,
-    http::{
-        header::{HeaderName, HeaderValue},
-        StatusCode,
-    },
-    HttpResponseBuilder, Responder,
+use markup::Render;
+use rocket::{
+    http::ContentType,
+    response::{self, Responder},
+    Request, Response,
 };
-use std::fmt::Display;
+use std::{fmt::Display, io::Cursor};
 
 pub mod home;
 pub mod layout;
 pub mod node;
 
-struct HtmlTemplate<T>(pub T);
+pub struct HtmlTemplate<T>(pub T);
 
-impl<T: markup::Render> Responder for HtmlTemplate<T> {
-    type Body = BoxBody;
-
-    fn respond_to(self, req: &actix_web::HttpRequest) -> actix_web::HttpResponse<Self::Body> {
+impl<'r, T: Render> Responder<'r, 'static> for HtmlTemplate<T> {
+    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> {
         let mut out = String::new();
         self.0.render(&mut out).unwrap();
-
-        HttpResponseBuilder::new(StatusCode::OK)
-            .body(out)
-            .respond_to(req)
-    }
-}
-
-pub struct ContentType<T>(pub &'static str, pub T);
-
-impl<T: Responder> Responder for ContentType<T> {
-    type Body = T::Body;
-
-    fn respond_to(self, req: &actix_web::HttpRequest) -> actix_web::HttpResponse<Self::Body> {
-        let mut r = self.1.respond_to(req);
-        r.headers_mut().insert(
-            HeaderName::from_static("content-type"),
-            HeaderValue::from_static(self.0),
-        );
-        r
+        Response::build()
+            .header(ContentType::HTML)
+            .streamed_body(Cursor::new(out))
+            .ok()
     }
 }
 
-pub type MyResult<T> = actix_web::Result<T, MyError>;
-
 #[derive(Debug)]
 pub struct MyError(anyhow::Error);
 
-impl actix_web::error::ResponseError for MyError {
-    fn status_code(&self) -> StatusCode {
-        StatusCode::BAD_REQUEST
-    }
-    fn error_response(&self) -> actix_web::HttpResponse<BoxBody> {
-        HttpResponseBuilder::new(StatusCode::BAD_REQUEST).body(format!("error: {}", self.0))
+impl<'r> Responder<'r, 'static> for MyError {
+    fn respond_to(self, _: &'r Request<'_>) -> response::Result<'static> {
+        Response::build()
+            .header(ContentType::HTML)
+            .streamed_body(Cursor::new(format!("{:?}", self.0)))
+            .ok()
     }
 }
+
 impl Display for MyError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.0.fmt(f)
diff --git a/src/frontend/pages/node.rs b/src/frontend/pages/node.rs
index bb8eb6c..cd0b4ec 100644
--- a/src/frontend/pages/node.rs
+++ b/src/frontend/pages/node.rs
@@ -1,19 +1,20 @@
 use crate::{
-    frontend::pages::{HtmlTemplate, MyResult, layout::Layout},
+    frontend::pages::{layout::Layout, HtmlTemplate},
     library::{Directory, Item, Node},
     AppState,
 };
-use actix_web::{get, web, Responder};
-use log::debug;
-use std::{ops::Deref, sync::Arc};
+use rocket::{get, uri, State};
+use std::{ops::Deref, path::PathBuf, sync::Arc};
 
-#[get("/library/{path:.*}")]
+use super::MyError;
+
+#[get("/library/<path..>")]
 pub async fn page_library_node(
-    state: web::Data<AppState>,
-    params: web::Path<(String,)>,
-) -> MyResult<impl Responder> {
-    debug!("request: {:?}", params.0);
-    let node = state.library.nested(&params.0)?;
+    path: PathBuf,
+    state: &State<AppState>,
+) -> Result<HtmlTemplate<markup::DynRender>, MyError> {
+    let path = path.to_str().unwrap().to_string();
+    let node = state.library.nested(&path)?.clone();
     Ok(HtmlTemplate(markup::new! {
         @match node.deref() {
             Node::Directory(dir) => {
@@ -34,7 +35,7 @@ pub async fn page_library_node(
 
 markup::define! {
     DirectoryCard(dir: Arc<Directory>) {
-        span { a[href=&dir.identifier] { @dir.data.name } }
+        span { a[href=&uri!(page_library_node(&dir.lib_path)).to_string()] { @dir.data.name } }
     }
     DirectoryPage(dir: Arc<Directory>) {
         h1 { @dir.data.name }
@@ -50,10 +51,9 @@ markup::define! {
         }
     }
     ItemCard(item: Arc<Item>) {
-        span { a[href=&item.identifier] { @item.data.title } }
+        span { a[href=&uri!(page_library_node(&item.lib_path)).to_string()] { @item.data.title } }
     }
     ItemPage(item: Arc<Item>) {
         h1 { @item.data.title }
     }
-
 }