player config works

1 files changed, 5 insertions, 6 deletions

diff --git a/server/src/routes/ui/node.rs b/server/src/routes/ui/node.rs
index b6d0d30..ea23291 100644
--- a/server/src/routes/ui/node.rs
+++ b/server/src/routes/ui/node.rs
@@ -1,5 +1,5 @@
-use super::super::stream::rocket_uri_macro_r_stream;
 use super::error::MyError;
+use super::player::player_uri;
 use crate::{
     library::{Directory, Item, Node},
     routes::ui::HtmlTemplate,
@@ -14,10 +14,9 @@ pub async fn r_library_node(
     path: PathBuf,
     state: &State<AppState>,
 ) -> Result<HtmlTemplate<markup::DynRender>, MyError> {
-    let path = path.to_str().unwrap().to_string();
     let node = state
         .library
-        .nested(&path)
+        .nested_path(&path)
         .context("retrieving library node")?
         .clone();
     Ok(HtmlTemplate(
@@ -52,10 +51,10 @@ markup::define! {
         }
     }
     ItemCard(item: Arc<Item>) {
-        span { a[href=&uri!(r_library_node(&item.lib_path)).to_string()] { @item.data.title } }
+        span { a[href=&uri!(r_library_node(&item.lib_path)).to_string()] { @item.info.title } }
     }
     ItemPage(item: Arc<Item>) {
-        h1 { @item.data.title }
-        video[src=&uri!(r_stream(&item.lib_path, "1,2")).to_string(), controls] {}
+        h1 { @item.info.title }
+        a[href=&player_uri(&item.lib_path)] { "Watch now" }
     }
 }