From 079fbf62ad125cfe69853c0bf543db7225d41020 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Sun, 16 Feb 2025 15:15:20 +0100 Subject: dont leak media paths, fix jsp profile selection and add small hack to accept relative timestamps from transcoding --- base/src/assetfed.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'base') diff --git a/base/src/assetfed.rs b/base/src/assetfed.rs index d20446b..575188d 100644 --- a/base/src/assetfed.rs +++ b/base/src/assetfed.rs @@ -6,7 +6,7 @@ use aes_gcm_siv::{ use anyhow::{anyhow, bail, Context}; use base64::Engine; use bincode::{Decode, Encode}; -use jellycommon::Asset; +use jellycommon::{Asset, LocalTrack}; use log::warn; use serde::Serialize; use std::{path::PathBuf, sync::LazyLock}; @@ -32,6 +32,7 @@ pub enum AssetInner { Cache(CachePath), Assets(PathBuf), Media(PathBuf), + LocalTrack(LocalTrack), } impl AssetInner { @@ -77,4 +78,11 @@ impl AssetInner { pub fn is_federated(&self) -> bool { matches!(self, Self::Federated { .. }) } + + pub fn as_local_track(self) -> Option { + match self { + AssetInner::LocalTrack(x) => Some(x), + _ => None, + } + } } -- cgit v1.2.3-70-g09d2