diff options
| author | metamuffin <metamuffin@disroot.org> | 2023-07-31 20:48:41 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2023-07-31 20:48:41 +0200 |
| commit | 8e8166c85a3d1f20dfeaf18f29d08d74c554fcbc (patch) | |
| tree | 278a3151639cceb54a53bea7fcdb8bac5d35a9fa /server/src/routes/ui/assets.rs | |
| parent | 30306bcf5a312c8749b1b66ef0a426cf7aaee989 (diff) | |
| download | jellything-8e8166c85a3d1f20dfeaf18f29d08d74c554fcbc.tar jellything-8e8166c85a3d1f20dfeaf18f29d08d74c554fcbc.tar.bz2 jellything-8e8166c85a3d1f20dfeaf18f29d08d74c554fcbc.tar.zst | |
other cleanup
Diffstat (limited to 'server/src/routes/ui/assets.rs')
| -rw-r--r-- | server/src/routes/ui/assets.rs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/server/src/routes/ui/assets.rs b/server/src/routes/ui/assets.rs index 27d322a..e9c7d24 100644 --- a/server/src/routes/ui/assets.rs +++ b/server/src/routes/ui/assets.rs @@ -28,13 +28,15 @@ pub async fn r_item_assets( db: &State<Database>, ) -> Result<(ContentType, CacheControlFile), MyError> { let node = db.node.get(&id)?.ok_or(anyhow!("node does not exist"))?; - let path = CONF.library_path.join( - match role { - AssetRole::Backdrop => node.private.backdrop, - AssetRole::Poster => node.private.poster, - } - .unwrap_or_else(|| PathBuf::from_str("fallback.jpeg").unwrap()), - ); + let path = match role { + AssetRole::Backdrop => node.private.backdrop, + AssetRole::Poster => node.private.poster, + } + .map(|e| CONF.library_path.join(e)) + .unwrap_or_else(|| { + CONF.asset_path + .join(PathBuf::from_str("fallback.jpeg").unwrap()) + }); info!("loading asset from {path:?}"); let ext = path.extension().unwrap().to_str().unwrap(); Ok(( |