diff options
Diffstat (limited to 'server/src/routes/ui/player.rs')
| -rw-r--r-- | server/src/routes/ui/player.rs | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs index 5222573..2bb439b 100644 --- a/server/src/routes/ui/player.rs +++ b/server/src/routes/ui/player.rs @@ -11,7 +11,10 @@ use super::{ }; use crate::{ database::Database, - routes::ui::{error::MyResult, layout::DynLayoutPage}, + routes::{ + locale::AcceptLanguage, + ui::{error::MyResult, layout::DynLayoutPage}, + }, }; use anyhow::anyhow; use jellybase::CONF; @@ -59,10 +62,12 @@ fn jellynative_url(action: &str, seek: f64, secret: &str, node: &str, session: & #[get("/n/<id>/player?<conf..>", rank = 4)] pub fn r_player( session: Session, + lang: AcceptLanguage, db: &State<Database>, id: NodeID, conf: PlayerConfig, ) -> MyResult<Either<DynLayoutPage<'_>, Redirect>> { + let AcceptLanguage(lang) = lang; let (node, udata) = db.get_node_with_userdata(id, &session)?; let mut parents = node @@ -112,19 +117,27 @@ pub fn r_player( // webm: Some(true), // ..Default::default() // }; + // let playing = false; // !spec.track.is_empty(); + // let conf = player_conf(node.clone(), playing)?; - let playing = false; // !spec.track.is_empty(); - - let conf = player_conf(node.clone(), playing)?; Ok(Either::Left(LayoutPage { title: node.title.to_owned().unwrap_or_default(), class: Some("player"), content: markup::new! { - @if playing { - // video[src=uri!(r_stream(&node.slug, &spec)), controls, preload="auto"]{} + // @if playing { + // // video[src=uri!(r_stream(&node.slug, &spec)), controls, preload="auto"]{} + // } + // @conf + @NodePage { + children: &[], + parents: &parents, + filter: &NodeFilterSort::default(), + node: &node, + udata: &udata, + player: true, + similar: &similar, + lang: &lang } - @NodePage { children: &[], parents: &parents, filter: &NodeFilterSort::default(), node: &node, udata: &udata, player: true, similar: &similar } - @conf }, })) } |