Fix genre evaluation with some Perl versions?

LMS-Community · Dec 14, 2024 · d2c4a6a · darrell-k · Dec 15, 2024 · michaelherger
1 parent ef12b9a
commit d2c4a6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/Slim/Schema.pm b/Slim/Schema.pm
@@ -1764,8 +1764,6 @@ sub _newTrack {
 	if ( _workRequired($deferredAttributes->{'GENRE'}) ) {
 		$workID = $self->_createWork($deferredAttributes->{'WORK'}, $deferredAttributes->{'WORKSORT'}, $contributors->{'COMPOSER'}->[0], 1);
 	}
-	else {
-	}
 
 	### Find artwork column values for the Track
 	if ( !$columnValueHash{cover} && $columnValueHash{audio} ) {

diff --git a/Slim/Schema/Genre.pm b/Slim/Schema/Genre.pm
@@ -58,14 +58,13 @@ sub loadMyClassicalGenreMap {
 }
 
 sub isMyClassicalGenre {
+	my ($class, $genres, $sep) = @_;
+
 	loadMyClassicalGenreMap() if !$myClassicalGenreMap;
-	my $class = shift;
-	my $genres = shift;
-	my $sep = shift;
-	foreach ( Slim::Music::Info::splitTag($genres, $sep) ) {
-		return 1 if %$myClassicalGenreMap{uc($_)}
-	}
-	return 0;
+
+	return grep {
+		$myClassicalGenreMap->{uc($_)}
+	} Slim::Music::Info::splitTag($genres, $sep) ? 1 : 0;
 }
 
 sub myClassicalGenreIds {