From d857684dd6358fb5ff979ca09ac78b5649b0f411 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 1 Oct 2023 09:20:39 +0200 Subject: jhls server-side draft --- remuxer/src/snippet.rs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'remuxer') diff --git a/remuxer/src/snippet.rs b/remuxer/src/snippet.rs index cd965ba..bc7f190 100644 --- a/remuxer/src/snippet.rs +++ b/remuxer/src/snippet.rs @@ -11,13 +11,13 @@ use anyhow::{anyhow, Context, Result}; use jellycommon::{seek_index::SeekIndex, LocalTrack, NodePublic}; use jellymatroska::{read::EbmlReader, write::EbmlWriter, Master, MatroskaTag}; use log::{debug, info}; -use std::{fs::File, io::Write, ops::Range, path::PathBuf}; +use std::{fs::File, io::Write, ops::Range, path::Path}; const SNIPPET_LENGTH: f64 = 2.; pub fn snippet_index( - path_base: PathBuf, - item: NodePublic, + path_base: &Path, + item: &NodePublic, track_sources: &Vec, track: usize, ) -> Result>> { @@ -49,8 +49,8 @@ pub fn snippet_index( pub fn write_snippet_into( writer: impl Write, - path_base: PathBuf, - item: NodePublic, + path_base: &Path, + item: &NodePublic, track_sources: Vec, track: usize, webm: bool, @@ -68,7 +68,10 @@ pub fn write_snippet_into( let private = &track_sources[track]; let source_path = path_base.join(&private.path); let mapped = 1; - info!("\t- {track} {source_path:?} ({} => {mapped})", private.track); + info!( + "\t- {track} {source_path:?} ({} => {mapped})", + private.track + ); info!("\t {}", info); let file = File::open(&source_path).context("opening source file")?; let mut index = File::open(source_path.with_extension(format!("si.{}", private.track))) -- cgit v1.2.3-70-g09d2