From f216112455cb297c59cc4964839005f6c94716bd Mon Sep 17 00:00:00 2001 From: Olivia Lee Date: Fri, 13 Dec 2024 01:18:09 -0800 Subject: [PATCH] don't treat media file open errors other than NotFound as missing media For example, we want to return M_UNKNOWN and propagate the error if somebody set up their database directory permissions wrong. --- src/service/media.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/service/media.rs b/src/service/media.rs index 4129649d..f892271c 100644 --- a/src/service/media.rs +++ b/src/service/media.rs @@ -392,8 +392,12 @@ impl Service { key: &MediaFileKey, ) -> Result>> { let path = services().globals.get_media_file(key); - let Ok(mut file) = File::open(path).await else { - return Ok(None); + let mut file = match File::open(path).await { + Ok(file) => file, + Err(e) if e.kind() == std::io::ErrorKind::NotFound => { + return Ok(None) + } + Err(e) => return Err(e.into()), }; let mut data = Vec::new();