Bugfix and small changes to styling

This commit is contained in:
Aidan Westphal 2024-11-22 21:47:24 +00:00
parent 21a17a8eb5
commit 45eb7191f0
2 changed files with 32 additions and 24 deletions

View File

@ -638,6 +638,12 @@ impl Album {
for (album, song, artist, like, dislike) in song_list { for (album, song, artist, like, dislike) in song_list {
if let Some(song) = song { if let Some(song) = song {
if let Some(stored_songdata) = album_songs.get_mut(&song.id.unwrap()) {
// If the song is already in the map, update the artists
if let Some(artist) = artist {
stored_songdata.artists.push(artist);
}
} else {
let like_dislike = match (like, dislike) { let like_dislike = match (like, dislike) {
(Some(_), Some(_)) => Some((true, true)), (Some(_), Some(_)) => Some((true, true)),
(Some(_), None) => Some((true, false)), (Some(_), None) => Some((true, false)),
@ -664,6 +670,7 @@ impl Album {
album_songs.insert(song.id.unwrap(), songdata); album_songs.insert(song.id.unwrap(), songdata);
} }
} }
}
// Sort the songs by date // Sort the songs by date
let mut songdata: Vec<SongData> = album_songs.into_values().collect(); let mut songdata: Vec<SongData> = album_songs.into_values().collect();

View File

@ -60,6 +60,7 @@
.album-artist { .album-artist {
margin: 5px; margin: 5px;
text-align: center; text-align: center;
text-decoration: underline;
} }
} }
} }