diff options
author | metamuffin <metamuffin@disroot.org> | 2025-03-02 21:01:28 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-03-02 21:01:28 +0100 |
commit | 8ee25c9ddd5ba5b6f74f7ec3b212020886e366c1 (patch) | |
tree | 6f6dfbd67c693ab0fe59d746ac61d7b8caa79b49 /server/src/routes/ui/player.rs | |
parent | b9539ee3afbf1440b8628bf0609dc0e24aed116c (diff) | |
download | jellything-8ee25c9ddd5ba5b6f74f7ec3b212020886e366c1.tar jellything-8ee25c9ddd5ba5b6f74f7ec3b212020886e366c1.tar.bz2 jellything-8ee25c9ddd5ba5b6f74f7ec3b212020886e366c1.tar.zst |
a
Diffstat (limited to 'server/src/routes/ui/player.rs')
-rw-r--r-- | server/src/routes/ui/player.rs | 60 |
1 files changed, 27 insertions, 33 deletions
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs index 2f28f74..aa567ab 100644 --- a/server/src/routes/ui/player.rs +++ b/server/src/routes/ui/player.rs @@ -9,16 +9,14 @@ use super::{ }; use crate::{ database::Database, - routes::{ - stream::rocket_uri_macro_r_stream, - ui::{assets::rocket_uri_macro_r_item_backdrop, error::MyResult, layout::DynLayoutPage}, + routes::ui::{ + assets::rocket_uri_macro_r_item_backdrop, error::MyResult, layout::DynLayoutPage, }, uri, }; use anyhow::anyhow; use jellybase::{permission::PermissionSetExt, CONF}; use jellycommon::{ - stream::{StreamFormat, StreamSpec}, user::{PermissionSet, PlayerKind, UserPermission}, Node, NodeID, SourceTrackKind, TrackID, }; @@ -47,13 +45,15 @@ impl PlayerConfig { fn jellynative_url(action: &str, seek: f64, secret: &str, node: &str, session: &str) -> String { let protocol = if CONF.tls { "https" } else { "http" }; let host = &CONF.hostname; - let stream_url = uri!(r_stream( - node, - StreamSpec { - format: StreamFormat::HlsMaster, - ..Default::default() - } - )); + let stream_url = ""; + // TODO + // uri!(r_stream( + // node, + // StreamSpec { + // format: StreamFormat::HlsMaster, + // ..Default::default() + // } + // )); format!("jellynative://{action}/{secret}/{session}/{seek}/{protocol}://{host}{stream_url}",) } @@ -67,14 +67,6 @@ pub fn r_player( let node = db.get_node(id)?.ok_or(anyhow!("node does not exist"))?; let native_session = |action: &str| { - let perm = [ - UserPermission::StreamFormat(StreamFormat::HlsMaster), - UserPermission::StreamFormat(StreamFormat::HlsVariant), - UserPermission::StreamFormat(StreamFormat::Fragment), - ]; - for perm in &perm { - sess.user.permissions.assert(perm)?; - } Ok(Either::Right(Redirect::temporary(jellynative_url( action, conf.t.unwrap_or(0.), @@ -82,7 +74,7 @@ pub fn r_player( &id.to_string(), &token::create( sess.user.name, - PermissionSet(perm.map(|e| (e, true)).into()), + PermissionSet::default(), // TODO chrono::Duration::hours(24), ), )))) @@ -98,19 +90,20 @@ pub fn r_player( } } - let spec = StreamSpec { - track: None - .into_iter() - .chain(conf.v) - .chain(conf.a) - .chain(conf.s) - .collect::<Vec<_>>(), - format: StreamFormat::Matroska, - webm: Some(true), - ..Default::default() - }; + // TODO + // let spec = StreamSpec { + // track: None + // .into_iter() + // .chain(conf.v) + // .chain(conf.a) + // .chain(conf.s) + // .collect::<Vec<_>>(), + // format: StreamFormat::Matroska, + // webm: Some(true), + // ..Default::default() + // }; - let playing = !spec.track.is_empty(); + let playing = false; // !spec.track.is_empty(); let conf = player_conf(node.clone(), playing)?; Ok(Either::Left(LayoutPage { @@ -118,7 +111,8 @@ pub fn r_player( class: Some("player"), content: markup::new! { @if playing { - video[src=uri!(r_stream(&node.slug, &spec)), controls, preload="auto"]{} + // TODO + // video[src=uri!(r_stream(&node.slug, &spec)), controls, preload="auto"]{} } else { img.backdrop[src=uri!(r_item_backdrop(&node.slug, Some(2048))).to_string()]; } |