diff options
author | metamuffin <metamuffin@disroot.org> | 2025-02-16 15:15:20 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2025-02-16 15:15:20 +0100 |
commit | 079fbf62ad125cfe69853c0bf543db7225d41020 (patch) | |
tree | 1445daa006936ad83edef1b217f05a9dc43e33bc /base/src/assetfed.rs | |
parent | abe663807337faa717f9485b047c8f0e808f2a09 (diff) | |
download | jellything-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 'base/src/assetfed.rs')
-rw-r--r-- | base/src/assetfed.rs | 10 |
1 files changed, 9 insertions, 1 deletions
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<LocalTrack> { + match self { + AssetInner::LocalTrack(x) => Some(x), + _ => None, + } + } } |