diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 383f4fb..020216c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -9,12 +9,15 @@ - + + + + + - @@ -27,6 +30,7 @@ + - { - "keyToString": { - "Cargo.Run.executor": "Run", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.cidr.known.project.marker": "true", - "RunOnceActivity.rust.reset.selective.auto.import": "true", - "WebServerToolWindowFactoryState": "false", - "cf.first.check.clang-format": "false", - "cidr.known.project.marker": "true", - "git-widget-placeholder": "master", - "last_opened_file_path": "/home/jude/Documents/navidrome-playlists", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true", - "org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "", - "org.rust.disableDetachedFileInspection/home/jude/navidrome-playlists/navidrome/src/client/mod.rs": "true", - "org.rust.disableDetachedFileInspection/home/jude/navidrome-playlists/navidrome/src/client/playlists.rs": "true", - "org.rust.disableDetachedFileInspection/home/jude/navidrome-playlists/navidrome/src/lib.rs": "true", - "org.rust.disableDetachedFileInspection/home/jude/navidrome-playlists/navidrome/src/models.rs": "true", - "org.rust.first.attach.projects": "true", - "settings.editor.selected.configurable": "language.rust.cargo.check", - "vue.rearranger.settings.migration": "true" + +}]]> @@ -169,7 +177,8 @@ - + + 1692008860369 diff --git a/Cargo.toml b/Cargo.toml index 88a9351..77ba7ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playlistd" -version = "0.2.4" +version = "0.2.5" edition = "2021" authors = ["Jude Southworth (judesouthworth@pm.me)"] license = "AGPL-3.0 only" diff --git a/src/daemon/update_playlists.rs b/src/daemon/update_playlists.rs index d164090..0cf559e 100644 --- a/src/daemon/update_playlists.rs +++ b/src/daemon/update_playlists.rs @@ -92,7 +92,10 @@ async fn update_playlist( .iter() .find(|s| { alpha_compare(&s.title, &recording.track_name) - && alpha_compare(&s.album, &recording.release_name) + && match &recording.release_name { + Some(release_name) => alpha_compare(&s.album, release_name), + None => true, + } }) .cloned(); diff --git a/src/listenbrainz.rs b/src/listenbrainz.rs index 10a8b21..4aa921e 100644 --- a/src/listenbrainz.rs +++ b/src/listenbrainz.rs @@ -82,7 +82,7 @@ pub struct Artist { #[derive(Deserialize)] pub struct RecordingsEntry { pub track_name: String, - pub release_name: String, + pub release_name: Option, pub artist_name: String, pub artists: Option>, }