From 9c340aa913d3d12181b5e6dc2d839862a7dea735 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 4 Oct 2023 13:58:27 +0200 Subject: [PATCH] fixed empty-string albums and possible artist empty string weirdness --- musicdb-filldb/src/main.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/musicdb-filldb/src/main.rs b/musicdb-filldb/src/main.rs index 64ca8ac..18d7f34 100755 --- a/musicdb-filldb/src/main.rs +++ b/musicdb-filldb/src/main.rs @@ -68,8 +68,8 @@ fn main() { let (artist_id, album_id) = if let Some(artist) = song .1 .album_artist() - .or_else(|| song.1.artist()) .filter(|v| !v.trim().is_empty()) + .or_else(|| song.1.artist().filter(|v| !v.trim().is_empty())) { let artist_id = if !artists.contains_key(artist) { let artist_id = database.add_artist_new(Artist { @@ -85,7 +85,7 @@ fn main() { } else { artists.get(artist).unwrap().0 }; - if let Some(album) = song.1.album() { + if let Some(album) = song.1.album().filter(|a| !a.trim().is_empty()) { let (_, albums) = artists.get_mut(artist).unwrap(); let album_id = if !albums.contains_key(album) { let album_id = database.add_album_new(Album {