From 9c854f0c5b142ce055470c17949a023ded1af806 Mon Sep 17 00:00:00 2001
From: Ryze <ryze312@tutanota.com>
Date: Sun, 12 Feb 2023 15:02:18 +0300
Subject: [PATCH] Added ability to pull cover art from album artist

---
 src/discord_client.rs              |  2 +-
 src/discord_client/music_brainz.rs | 34 ++++++++++++++++++++++++------
 src/mpv_event_queue.rs             |  2 ++
 src/mpv_event_queue/events.rs      |  1 +
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/discord_client.rs b/src/discord_client.rs
index df6eb38..7385fd0 100644
--- a/src/discord_client.rs
+++ b/src/discord_client.rs
@@ -157,7 +157,7 @@ impl DiscordClient {
             return ("logo".to_string(), "mpv".to_string())
         }
 
-        let cover_art_url = music_brainz::get_cover_art_url(&metadata.title, &metadata.album, &metadata.artist);
+        let cover_art_url = music_brainz::get_cover_art_url(&metadata.title, &metadata.album, &metadata.artist, &metadata.album_artist);
         let large_image = match cover_art_url {
             Some(url) => url,
             None => "logo".to_string()
diff --git a/src/discord_client/music_brainz.rs b/src/discord_client/music_brainz.rs
index f682b74..0139c57 100644
--- a/src/discord_client/music_brainz.rs
+++ b/src/discord_client/music_brainz.rs
@@ -2,16 +2,18 @@ use musicbrainz_rs::entity::release_group::{ReleaseGroup, ReleaseGroupSearchQuer
 use musicbrainz_rs::entity::CoverartResponse;
 use musicbrainz_rs::{Search, FetchCoverart};
 
-pub fn get_cover_art_url(title: &Option<String>, album: &Option<String>, artist: &Option<String>) -> Option<String>{
+pub fn get_cover_art_url(title: &Option<String>, album: &Option<String>, artist: &Option<String>, album_artist: &Option<String>) -> Option<String>{
+    get_track_cover_art(artist, title).or(
+        get_album_cover_art(album_artist, album)
+    )
+}
+
+fn get_track_cover_art(artist: &Option<String>, title: &Option<String>) -> Option<String> {
     let mut builder = ReleaseGroupSearchQuery::query_builder();
     if let Some(ref title) = title {
         builder.release_group(title);
     }
 
-    if let Some(ref album) = album {
-        builder.or().release_group(album);
-    }
-
     if let Some(ref artist) = artist {
         // Some artist fields might contain + characters
         // Pointing at multiple artists
@@ -19,9 +21,27 @@ pub fn get_cover_art_url(title: &Option<String>, album: &Option<String>, artist:
             builder.and().artist(part);
         }
     }
+    get_cover_art_from_query(builder.build())
+}
 
-    let query = builder.build();
-    
+fn get_album_cover_art(album_artist: &Option<String>,  album: &Option<String>) -> Option<String> {
+    let mut builder = ReleaseGroupSearchQuery::query_builder();
+    if let Some(ref album) = album {
+        builder.release_group(album);
+    }
+
+    if let Some(ref album_artist) = album_artist {
+        // Some artist fields might contain + characters
+        // Pointing at multiple artists
+        for part in album_artist.split("+") {
+            builder.and().artist(part);
+        }
+    }
+
+    get_cover_art_from_query(builder.build())
+}
+
+fn get_cover_art_from_query(query: String) -> Option<String> {
     let result = match ReleaseGroup::search(query).execute() {
         Ok(res) => res,
         Err(_) => return None
diff --git a/src/mpv_event_queue.rs b/src/mpv_event_queue.rs
index c53312f..3494dae 100644
--- a/src/mpv_event_queue.rs
+++ b/src/mpv_event_queue.rs
@@ -78,12 +78,14 @@ impl MpvEventQueue {
     fn get_file_info_event(&self) -> Option<MpvEvent> {
         let filename = self.mpv.get_property("filename").unwrap();
         let artist = self.mpv.get_property("metadata/by-key/artist").ok();
+        let album_artist = self.mpv.get_property("metadata/by-key/album_artist").ok();
         let album = self.mpv.get_property("metadata/by-key/album").ok();
         let title = self.mpv.get_property("metadata/by-key/title").ok();
         let track = self.mpv.get_property("metadata/by-key/track").ok();
 
         let metadata = FileMetadata {
             artist,
+            album_artist,
             album,
             title,
             track
diff --git a/src/mpv_event_queue/events.rs b/src/mpv_event_queue/events.rs
index a11aaf6..f88f07e 100644
--- a/src/mpv_event_queue/events.rs
+++ b/src/mpv_event_queue/events.rs
@@ -5,6 +5,7 @@ pub struct FileInfo {
 
 pub struct FileMetadata {
     pub artist: Option<String>,
+    pub album_artist: Option<String>,
     pub album: Option<String>,
     pub title: Option<String>,
     pub track: Option<String>