expose musicbrainz metadata if available

hoyon · Aug 9, 2022 · 75db00a · 75db00a
1 parent 6f07b20
commit 75db00a
Showing 1 changed file with 34 additions and 6 deletions.
diff --git a/mpris.c b/mpris.c
@@ -125,13 +125,14 @@ static void add_metadata_item_int(mpv_handle *mpv, GVariantDict *dict,
 }
 
 static void add_metadata_item_string_list(mpv_handle *mpv, GVariantDict *dict,
-                                          const char *property, const char *tag)
+                                          const char *property, const char *tag,
+                                          const char *sep)
 {
     char *temp = mpv_get_property_string(mpv, property);
 
     if (temp) {
         GVariantBuilder builder;
-        char **list = g_strsplit(temp, ", ", 0);
+        char **list = g_strsplit(temp, sep, 0);
         char **iter = list;
         g_variant_builder_init(&builder, G_VARIANT_TYPE("as"));
 
@@ -149,6 +150,28 @@ static void add_metadata_item_string_list(mpv_handle *mpv, GVariantDict *dict,
     }
 }
 
+static void add_metadata_mb(mpv_handle *mpv, GVariantDict *dict,
+                                     const char *property, const char *tag)
+{
+    char *temp = mpv_get_property_string(mpv, property);
+
+    if (temp) {
+      /* Check for multi-value ID3 v2.3 tag (forward slash as separator) */
+      if (strchr(temp, '/') != NULL) {
+        add_metadata_item_string_list(mpv, dict, property, tag, "/");
+      }
+      /* Check for multi-value ID3 v2.4 tag (semicolon as separator) */
+      else if (strchr(temp, ';') != NULL) {
+        add_metadata_item_string_list(mpv, dict, property, tag, ";");
+      }
+      /* Default to single value */
+      else {
+        add_metadata_item_string(mpv, dict, property, tag);
+      }
+      mpv_free(temp);
+    }
+}
+
 static gchar *path_to_uri(mpv_handle *mpv, char *path)
 {
 #if GLIB_CHECK_VERSION(2, 58, 0)
@@ -360,10 +383,15 @@ static GVariant *create_metadata(UserData *ud)
     add_metadata_item_string(ud->mpv, &dict, "metadata/by-key/Album", "xesam:album");
     add_metadata_item_string(ud->mpv, &dict, "metadata/by-key/Genre", "xesam:genre");
 
-    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/uploader", "xesam:artist");
-    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/Artist", "xesam:artist");
-    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/Album_Artist", "xesam:albumArtist");
-    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/Composer", "xesam:composer");
+    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/uploader", "xesam:artist", ", ");
+    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/Artist", "xesam:artist", ", ");
+    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/Album_Artist", "xesam:albumArtist", ", ");
+    add_metadata_item_string_list(ud->mpv, &dict, "metadata/by-key/Composer", "xesam:composer", ", ");
+
+    add_metadata_mb(ud->mpv, &dict, "metadata/by-key/MusicBrainz Release Track Id", "mb:trackId");
+    add_metadata_mb(ud->mpv, &dict, "metadata/by-key/MusicBrainz Album Id", "mb:albumId");
+    add_metadata_mb(ud->mpv, &dict, "metadata/by-key/MusicBrainz Artist Id", "mb:artistId");
+    add_metadata_mb(ud->mpv, &dict, "metadata/by-key/MusicBrainz Album Artist Id", "mb:albumartistId");
 
     add_metadata_item_int(ud->mpv, &dict, "metadata/by-key/Track", "xesam:trackNumber");
     add_metadata_item_int(ud->mpv, &dict, "metadata/by-key/Disc", "xesam:discNumber");