Merge pull request #1331 from darrell-k/fix-scan-multiple-mb_ids

Fixes for Musicbrainz ID processing
LMS-Community · Feb 19, 2025 · a75ba6f · a75ba6f
2 parents 31f2c4e + 2b1b59c
commit a75ba6f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Slim/Formats.pm b/Slim/Formats.pm
@@ -315,7 +315,7 @@ sub readTags {
 				foreach my $mbID ( Slim::Music::Info::splitTag($value) ) {
 					if ( $tag eq 'MUSICBRAINZ_DISCID' && $mbID =~ /^[0-9a-z_\.-]{28}$/i ) {
 						push @mbIDs, lc($1);
-					} elsif ( $mbID =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/i ) {
+					} elsif ( $mbID =~ /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})$/i ) {
 						push @mbIDs, lc($1);
 					}
 					else {
@@ -326,7 +326,7 @@ sub readTags {
 						next TAG;
 					}
 				}
-				$tags->{$tag} = \@mbIDs;
+				$value = $tags->{$tag} = \@mbIDs;
 			}
 
 			$tagCache{$original} = $value;

diff --git a/Slim/Music/Info.pm b/Slim/Music/Info.pm
@@ -1008,7 +1008,7 @@ sub splitTag {
 
 	# Handle Vorbis comments where the tag can be an array.
 	if (ref($tag) eq 'ARRAY') {
-
+		map { $_ =~ s/^\s+|\s+$//g; } @$tag;
 		return @$tag;
 	}
 
@@ -1061,6 +1061,7 @@ sub splitTag {
 		return @splitTags;
 	}
 
+	$tag =~ s/^\s+|\s+$//g;
 	return $tag;
 }
 

diff --git a/Slim/Schema.pm b/Slim/Schema.pm
@@ -912,7 +912,7 @@ sub _createOrUpdateAlbum {
 	my $disc      = $attributes->{DISC};
 	my $discc     = $attributes->{DISCC};
 	# Bug 10583 - Also check for MusicBrainz Album Id
-	my $brainzId  = $attributes->{MUSICBRAINZ_ALBUM_ID};
+	my $brainzId  = $attributes->{MUSICBRAINZ_ALBUM_ID}[0]; # Surely there is only one MB album id!
 	my $extId     = $attributes->{EXTID} || $attributes->{ALBUM_EXTID};
 
 	# if we have a disc number from an online service, default disc count to 1