aboutsummaryrefslogtreecommitdiff
path: root/stream
diff options
context:
space:
mode:
authormetamuffin <metamuffin@disroot.org>2025-02-16 15:15:20 +0100
committermetamuffin <metamuffin@disroot.org>2025-02-16 15:15:20 +0100
commit079fbf62ad125cfe69853c0bf543db7225d41020 (patch)
tree1445daa006936ad83edef1b217f05a9dc43e33bc /stream
parentabe663807337faa717f9485b047c8f0e808f2a09 (diff)
downloadjellything-079fbf62ad125cfe69853c0bf543db7225d41020.tar
jellything-079fbf62ad125cfe69853c0bf543db7225d41020.tar.bz2
jellything-079fbf62ad125cfe69853c0bf543db7225d41020.tar.zst
dont leak media paths, fix jsp profile selection and add small hack to accept relative timestamps from transcoding
Diffstat (limited to 'stream')
-rw-r--r--stream/src/lib.rs5
1 files changed, 4 insertions, 1 deletions
diff --git a/stream/src/lib.rs b/stream/src/lib.rs
index ca7578d..00338c1 100644
--- a/stream/src/lib.rs
+++ b/stream/src/lib.rs
@@ -13,6 +13,7 @@ use anyhow::{anyhow, bail, Context, Result};
use fragment::fragment_stream;
use hls::{hls_master_stream, hls_variant_stream};
use jellybase::{
+ assetfed::AssetInner,
common::{
stream::{StreamFormat, StreamSpec},
user::{PermissionSet, UserPermission},
@@ -73,7 +74,9 @@ pub async fn stream(
.ok_or(anyhow!("track does not exist"))?
.source
{
- TrackSource::Local(t) => t.to_owned(),
+ TrackSource::Local(t) => AssetInner::deser(&t.0)?
+ .as_local_track()
+ .ok_or(anyhow!("asset not a track"))?,
TrackSource::Remote(_) => bail!("track is not local"),
},
)