wojtek/musichoard
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects 1 Releases 2 Wiki Activity

Some more clean up

Browse Source
This commit is contained in:
Wojciech Kozlowski 2023-03-31 00:00:32 +09:00
parent 6dacdd3742
commit 84b05567de
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib.rs
View File

@ -17,7 +17,8 @@ pub struct Track {
pub artist: Vec<String>,
}
#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Hash)]
/// The album identifier.
#[derive(Debug, Deserialize, Serialize, PartialEq, Eq, Clone, Hash)]
pub struct AlbumId {
pub artist: String,
pub year: u32,

22
src/library/beets.rs
View File

@ -123,32 +123,26 @@ impl Beets {
let track_title = split[4].to_string();
let track_artist = split[5].to_string();
let track = Track {
number: track_number,
title: track_title,
artist: track_artist.split("; ").map(|s| s.to_owned()).collect(),
};
let aid = AlbumId {
artist: album_artist,
year: album_year,
title: album_title,
};
let track = Track {
number: track_number,
title: track_title,
artist: track_artist.split("; ").map(|s| s.to_owned()).collect(),
};
if album_ids.contains(&aid) {
// Beets returns results in order so we look from the back.
let album = albums.iter_mut().rev().find(|a| a.id == aid).unwrap();
album.tracks.push(track);
} else {
let album_artist = aid.artist.to_string();
let album_title = aid.title.to_string();
album_ids.insert(aid);
album_ids.insert(aid.clone());
albums.push(Album {
id: AlbumId {
artist: album_artist,
year: album_year,
title: album_title,
},
id: aid,
tracks: vec![track],
});
}