diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-08-02 01:03:16 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-08-02 01:03:16 +0200 |
| commit | 14e01792e33631d134fe895018d3bef5ea74a958 (patch) | |
| tree | 5c4f0105140541cd479a58c1abb598caaee2d94b /server/src/routes/ui/player.rs | |
| parent | 6eafafe5297c54aa5cb38790c45ba189b47d755e (diff) | |
| download | jellything-14e01792e33631d134fe895018d3bef5ea74a958.tar jellything-14e01792e33631d134fe895018d3bef5ea74a958.tar.bz2 jellything-14e01792e33631d134fe895018d3bef5ea74a958.tar.zst | |
move client code to its own crate
Diffstat (limited to 'server/src/routes/ui/player.rs')
| -rw-r--r-- | server/src/routes/ui/player.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/src/routes/ui/player.rs b/server/src/routes/ui/player.rs index 2af9d9e..e295b02 100644 --- a/server/src/routes/ui/player.rs +++ b/server/src/routes/ui/player.rs @@ -7,7 +7,7 @@ use super::{account::session::Session, layout::LayoutPage}; use crate::{ database::Database, routes::{ - stream::stream_uri, + stream::rocket_uri_macro_r_stream, ui::{ assets::{rocket_uri_macro_r_item_assets, AssetRole}, error::MyResult, @@ -21,7 +21,6 @@ use jellycommon::{Node, SourceTrackKind}; use markup::DynRender; use rocket::{get, FromForm, State}; - #[derive(FromForm, Default, Clone, Debug)] pub struct PlayerConfig { pub a: Option<u64>, @@ -47,7 +46,9 @@ pub fn r_player( .chain(conf.v.into_iter()) .chain(conf.a.into_iter()) .chain(conf.s.into_iter()) - .collect::<Vec<_>>(); + .map(|e| format!("{e}")) + .collect::<Vec<_>>() + .join(","); let conf = player_conf(item.clone(), !tracks.is_empty())?; Ok(LayoutPage { @@ -57,7 +58,7 @@ pub fn r_player( @if tracks.is_empty() { img.backdrop[src=uri!(r_item_assets(&id, AssetRole::Backdrop)).to_string()]; } else { - video[src=stream_uri(&id, &tracks, true), controls]{} + video[src=uri!(r_stream(&id, &tracks, Some(true))), controls]{} } @conf }, |