diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-01-24 18:11:23 +0100 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-01-24 18:47:29 +0100 |
| commit | 7323709537c6ff14136cd79fb07606cd79391758 (patch) | |
| tree | 3d817d449d4c0a821b9b5073c8acf826c6ccfda1 /stream | |
| parent | cbb2e163abfefd8ed61c41a096d5d6c27b4721b4 (diff) | |
| download | jellything-7323709537c6ff14136cd79fb07606cd79391758.tar jellything-7323709537c6ff14136cd79fb07606cd79391758.tar.bz2 jellything-7323709537c6ff14136cd79fb07606cd79391758.tar.zst | |
refactor asset system pt. 1
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/src/hls.rs | 2 | ||||
| -rw-r--r-- | stream/src/jhls.rs | 2 | ||||
| -rw-r--r-- | stream/src/lib.rs | 4 | ||||
| -rw-r--r-- | stream/src/segment.rs | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/stream/src/hls.rs b/stream/src/hls.rs index fb7276d..61d031c 100644 --- a/stream/src/hls.rs +++ b/stream/src/hls.rs @@ -51,7 +51,7 @@ pub async fn hls_variant_stream( ) -> Result<()> { let snips = spawn_blocking(move || { jellyremuxer::snippet::snippet_index( - &CONF.library_path, + &CONF.media_path, &node.public, local_tracks.get(0).ok_or(anyhow!("no track"))?, ) diff --git a/stream/src/jhls.rs b/stream/src/jhls.rs index e58aafe..7a7b3af 100644 --- a/stream/src/jhls.rs +++ b/stream/src/jhls.rs @@ -26,7 +26,7 @@ pub async fn jhls_index( .to_owned(); let segments = tokio::task::spawn_blocking(move || { - jellyremuxer::snippet::snippet_index(&CONF.library_path, &node.public, &local_track) + jellyremuxer::snippet::snippet_index(&CONF.media_path, &node.public, &local_track) }) .await??; diff --git a/stream/src/lib.rs b/stream/src/lib.rs index fcd3f9d..3d12f74 100644 --- a/stream/src/lib.rs +++ b/stream/src/lib.rs @@ -106,7 +106,7 @@ async fn remux_stream( jellyremuxer::remux_stream_into( b, range, - CONF.library_path.to_owned(), + CONF.media_path.to_owned(), node.public, local_tracks, spec.tracks, @@ -128,7 +128,7 @@ async fn original_stream( } let source = local_tracks[spec.tracks[0]].clone(); - let mut file = File::open(CONF.library_path.join(source.path)) + let mut file = File::open(CONF.media_path.join(source.path)) .await .context("opening source")?; file.seek(SeekFrom::Start(range.start as u64)) diff --git a/stream/src/segment.rs b/stream/src/segment.rs index a2553bc..fc4aaf4 100644 --- a/stream/src/segment.rs +++ b/stream/src/segment.rs @@ -4,7 +4,7 @@ Copyright (C) 2023 metamuffin <metamuffin.org> */ use anyhow::{anyhow, bail, Result}; -use jellybase::{permission::PermissionSetExt, AssetLocationExt, CONF}; +use jellybase::{permission::PermissionSetExt, CONF}; use jellycommon::{ stream::StreamSpec, user::{PermissionSet, UserPermission}, @@ -44,7 +44,7 @@ pub async fn segment_stream( tokio::task::spawn_blocking(move || { if let Err(err) = jellyremuxer::write_snippet_into( SyncIoBridge::new(b), - &CONF.library_path, + &CONF.media_path, &node.public, &local_track, track, @@ -57,7 +57,7 @@ pub async fn segment_stream( }, ) .await?; - let mut output = File::open(location.path()).await?; + let mut output = File::open(location.abs()).await?; tokio::task::spawn(async move { if let Err(err) = tokio::io::copy(&mut output, &mut b).await { warn!("cannot write stream: {err}") @@ -68,7 +68,7 @@ pub async fn segment_stream( tokio::task::spawn_blocking(move || { if let Err(err) = jellyremuxer::write_snippet_into( b, - &CONF.library_path, + &CONF.media_path, &node.public, &local_track, track, |