diff --git a/CHANGELOG.md b/CHANGELOG.md index b8c491d..5d682df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ One section per version, newest first. +## v0.8.6 (2026-11-04) + +### Bug fixes + +- Covers cached by versions before 0.8.0 are deleted on start. They were no longer used but stayed on disk. + ## v0.8.5 (2026-11-04) ### Bug fixes diff --git a/Cargo.lock b/Cargo.lock index fc12b0f..eeae572 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4385,7 +4385,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "remus" -version = "0.8.5" +version = "0.8.6" dependencies = [ "anyhow", "directories", diff --git a/Cargo.toml b/Cargo.toml index 714919b..f50b7c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "remus" -version = "0.8.5" +version = "0.8.6" edition = "2024" license = "MIT" diff --git a/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml b/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml index 58c0850..b506292 100644 --- a/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml +++ b/flatpak/me.anshorei.Fettleshed.Remus.metainfo.xml @@ -20,6 +20,7 @@ + diff --git a/src/app.rs b/src/app.rs index 8df900b..f92f0b3 100644 --- a/src/app.rs +++ b/src/app.rs @@ -5,7 +5,7 @@ use std::cell::RefCell; use std::collections::{HashMap, HashSet}; use std::future::Future; use std::num::NonZeroUsize; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::rc::Rc; use std::sync::Arc; use std::time::{Duration, Instant}; @@ -330,6 +330,9 @@ impl App { { log::warn!("cover cache disabled, cannot create {}: {e}", d.display()); } + if let Some(d) = dir.clone() { + rt.spawn_blocking(move || remove_unkeyed_covers(&d)); + } let inhibitor = Inhibitor::spawn(&rt); let mpris = Mpris::spawn(&rt, |c| { let _ = slint::invoke_from_event_loop(move || with_app(move |app| app.mpris_command(c))); @@ -2795,6 +2798,22 @@ fn color(lab: Lab) -> Color { Color::from_rgb_u8(r, g, b) } +/// Deletes the covers that versions before 0.8.0 cached straight under +/// `root`. Covers now live in a directory per server, so files directly in +/// `root` are never read again. +fn remove_unkeyed_covers(root: &Path) { + let Ok(entries) = std::fs::read_dir(root) else { return }; + let mut removed = 0; + for entry in entries.flatten() { + if entry.file_type().is_ok_and(|t| t.is_file()) && std::fs::remove_file(entry.path()).is_ok() { + removed += 1; + } + } + if removed > 0 { + log::info!("removed {removed} covers cached before covers were kept per server"); + } +} + fn sanitize(id: &str) -> String { id.chars() .map(|c| { @@ -2896,6 +2915,22 @@ fn join_dot>>(parts: I) -> String { mod tests { use super::*; + #[test] + fn unkeyed_covers_go_and_server_directories_stay() { + let root = std::env::temp_dir().join(format!("remus-covers-{}", std::process::id())); + let _ = std::fs::remove_dir_all(&root); + let server = root.join("u_https___host"); + std::fs::create_dir_all(&server).unwrap(); + std::fs::write(root.join("al-1_600"), b"old").unwrap(); + std::fs::write(server.join("al-1_600"), b"new").unwrap(); + + remove_unkeyed_covers(&root); + + assert!(!root.join("al-1_600").exists()); + assert!(server.join("al-1_600").exists()); + let _ = std::fs::remove_dir_all(&root); + } + fn png(pixel: [u8; 3]) -> Vec { let img = image::RgbImage::from_pixel(8, 8, image::Rgb(pixel)); let mut out = std::io::Cursor::new(Vec::new());