Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bce0d68442 | ||
|
|
d77316b5b7 |
@@ -2,6 +2,18 @@
|
||||
|
||||
One section per version, newest first.
|
||||
|
||||
## v0.8.7 (2026-11-04)
|
||||
|
||||
### Features
|
||||
|
||||
- On an album page, a track whose cover is a different picture from the album's shows its cover instead of its track number. Only servers that give tracks their own art, such as Navidrome, can show this; Nextcloud Music gives every track the album's cover.
|
||||
|
||||
## 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
|
||||
|
||||
Generated
+1
-1
@@ -4385,7 +4385,7 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
|
||||
|
||||
[[package]]
|
||||
name = "remus"
|
||||
version = "0.8.5"
|
||||
version = "0.8.7"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"directories",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "remus"
|
||||
version = "0.8.5"
|
||||
version = "0.8.7"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
</supports>
|
||||
<content_rating type="oars-1.1"/>
|
||||
<releases>
|
||||
<release version="0.8.7" date="2026-11-04"/>
|
||||
<release version="0.8.6" date="2026-11-04"/>
|
||||
<release version="0.8.5" date="2026-11-04"/>
|
||||
<release version="0.8.4" date="2026-11-04"/>
|
||||
<release version="0.8.3" date="2026-11-04"/>
|
||||
|
||||
+71
-3
@@ -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)));
|
||||
@@ -1661,6 +1664,33 @@ impl App {
|
||||
self.items_range = (lo, hi);
|
||||
}
|
||||
|
||||
/// The album's cover id, on an album page.
|
||||
fn album_cover_id(&self) -> Option<String> {
|
||||
let page = self.current_page()?;
|
||||
if !page.list || !matches!(page.source, Source::Album(_)) {
|
||||
return None;
|
||||
}
|
||||
page.header.as_ref()?.cover.clone()
|
||||
}
|
||||
|
||||
/// Whether a track's cover is a different picture from its album's, so its
|
||||
/// row shows the cover instead of the track number. Compared by picture:
|
||||
/// Navidrome gives every track its own cover id even when it is the album's
|
||||
/// image. False until both are decoded at this size; the load of either
|
||||
/// redraws the row.
|
||||
fn own_picture(&mut self, track: Option<&str>, album: &str, px: u32) -> bool {
|
||||
let Some(track) = track.filter(|t| *t != album) else {
|
||||
return false;
|
||||
};
|
||||
// Starts the album cover's load at row size, which the header does not.
|
||||
self.cover(album, px);
|
||||
let print = |app: &mut App, id: &str| app.covers.prints.get(&(id.to_string(), px)).copied();
|
||||
match (print(self, track), print(self, album)) {
|
||||
(Some(t), Some(a)) => t != a,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
fn playing_id(&self) -> Option<&str> {
|
||||
self.current.and_then(|i| self.queue.get(i)).map(|s| s.id.as_str())
|
||||
}
|
||||
@@ -1672,7 +1702,11 @@ impl App {
|
||||
Target::Song(i) => page.songs.get(i).map(|s| s.id.as_str()) == self.playing_id(),
|
||||
_ => false,
|
||||
};
|
||||
let album_cover = self.album_cover_id();
|
||||
let cover = entry.cover.as_deref().and_then(|id| self.cover(id, px));
|
||||
let show_art = entry.show_art
|
||||
|| matches!(entry.target, Target::Song(_))
|
||||
&& album_cover.is_some_and(|album| self.own_picture(entry.cover.as_deref(), &album, px));
|
||||
let level = match entry.target {
|
||||
Target::Setting(Setting::CoverBackdrop) => Some(self.settings.cover_backdrop as f32 / 100.0),
|
||||
_ => None,
|
||||
@@ -1688,7 +1722,7 @@ impl App {
|
||||
has_cover: cover.is_some(),
|
||||
cover: cover.unwrap_or_default(),
|
||||
round: entry.round,
|
||||
show_art: entry.show_art,
|
||||
show_art,
|
||||
playing,
|
||||
slider: level.is_some(),
|
||||
level: level.unwrap_or_default(),
|
||||
@@ -1923,9 +1957,11 @@ impl App {
|
||||
|
||||
// Refresh whatever shows this cover.
|
||||
let (lo, hi) = self.items_range;
|
||||
// Every track row of an album compares its picture with the album's.
|
||||
let album = self.album_cover_id().as_deref() == Some(id);
|
||||
let rows: Vec<usize> = match self.current_page() {
|
||||
Some(p) => (lo..hi.min(p.entries.len()))
|
||||
.filter(|&i| p.entries[i].cover.as_deref() == Some(id))
|
||||
.filter(|&i| album || p.entries[i].cover.as_deref() == Some(id))
|
||||
.collect(),
|
||||
None => Vec::new(),
|
||||
};
|
||||
@@ -2795,6 +2831,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 +2948,22 @@ fn join_dot<I: IntoIterator<Item = Option<String>>>(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<u8> {
|
||||
let img = image::RgbImage::from_pixel(8, 8, image::Rgb(pixel));
|
||||
let mut out = std::io::Cursor::new(Vec::new());
|
||||
|
||||
+3
-1
@@ -213,8 +213,10 @@ component Row inherits Rectangle {
|
||||
round: root.item.round;
|
||||
}
|
||||
}
|
||||
// As wide as the art, so a row with a cover and a row with a number
|
||||
// line up, as on an album where some tracks have their own cover.
|
||||
if !root.item.show-art: Text {
|
||||
width: 34px * Theme.s;
|
||||
width: 46px * Theme.s;
|
||||
text: root.item.playing ? "▶" : root.item.number;
|
||||
font-size: 15px * Theme.s;
|
||||
color: root.item.playing ? Theme.highlight : Theme.faint;
|
||||
|
||||
Reference in New Issue
Block a user