Display artist

Changelog9.html

@@ -9,6 +9,7 @@ <h2><a name="v9.2.0" id="v9.2.0"></a>Version 9.2.0</h2>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1541">#1541</a> - Add per-player timezone support: players can now display date and time, and fire alarms, in their own timezone rather than the server's. (@boudekerk)</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1546">#1546</a> - Add "Default Adjustment for Local Tracks" player option. (@SamInPgh)</li>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1564">#1564</a> - Add Dismiss option to Jive alarm popup (@boudekerk)</li>
+		<li><a href="https://github.com/LMS-Community/slimserver/issues/1555">#1555</a> - Store display_artist from ALBUMARTIST/ARTIST tags separately from individual contributors. Optional use of ALBUMARTISTS/ARTISTS plural tags for contributor creation. (@Rouzax, @darrell-k)</li>
 	</ul>
 	<br />
 

HTML/EN/settings/server/behavior.html

@@ -195,6 +195,15 @@
 		</select>
 	[% END %]
 
+	[% WRAPPER setting title="SETUP_USEPLURALARTISTTAGS" desc="SETUP_USEPLURALARTISTTAGS_DESC"%]
+		<select class="stdedit" name="pref_usePluralArtistTags" id="usePluralArtistTags">
+
+			<option [% IF NOT prefs.pref_usePluralArtistTags %]selected [% END %]value="0">[% 'SETUP_USEPLURALARTISTTAGS_0' | string %]</option>
+			<option [% IF prefs.pref_usePluralArtistTags %]selected [% END %]value="1">[% 'SETUP_USEPLURALARTISTTAGS_1' | string %]</option>
+
+		</select>
+	[% END %]
+
 	[% WRAPPER setting title="SETUP_YEARMENU" desc="SETUP_YEARMENU_DESC"%]
 		<select class="stdedit" name="pref_onlyAlbumYears" id="onlyAlbumYears">
 

SQL/SQLite/schema_27_up.sql

@@ -0,0 +1,36 @@
+-- full relational solution for display_artist
+
+DROP TABLE IF EXISTS contributor_display;
+CREATE TABLE contributor_display (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  name blob);
+ALTER TABLE albums ADD display_contributor integer;
+
+DROP TABLE IF EXISTS contributor_album_display;
+CREATE TABLE contributor_album_display (
+  contributor_display  int(10),
+  contributor  int(10),
+  album  int(10),
+  PRIMARY KEY (contributor_display,contributor,album),
+  FOREIGN KEY (`album`) REFERENCES `albums` (`id`) ON DELETE CASCADE,
+  FOREIGN KEY (`contributor`) REFERENCES `contributors` (`id`) ON DELETE CASCADE
+);
+CREATE INDEX contributor_album_displayContribIndex ON contributor_album_display (contributor);
+CREATE INDEX contributor_album_displayAlbumIndex ON contributor_album_display (album);
+CREATE INDEX contributor_album_displayContributorDisplayIndex ON contributor_album_display (contributor_display);
+
+ALTER TABLE tracks ADD display_contributor integer;
+
+DROP TABLE IF EXISTS contributor_track_display;
+CREATE TABLE contributor_track_display (
+  contributor_display  int(10),
+  contributor  int(10),
+  track int(10),
+  PRIMARY KEY (contributor_display,contributor,track),
+  FOREIGN KEY (`track`) REFERENCES `tracks` (`id`) ON DELETE CASCADE,
+  FOREIGN KEY (`contributor`) REFERENCES `contributors` (`id`) ON DELETE CASCADE
+);
+CREATE INDEX contributor_track_displayContribIndex ON contributor_track_display (contributor);
+CREATE INDEX contributor_track_displayTrackIndex ON contributor_track_display (track);
+CREATE INDEX contributor_track_displayContributorDisplayIndex ON contributor_track_display (contributor_display);
+

SQL/SQLite/schema_clear.sql

@@ -31,6 +31,12 @@ DELETE FROM library_album;
 DELETE FROM library_contributor;
 DELETE FROM library_genre;
 
+DELETE FROM contributor_display;
+
+DELETE FROM contributor_album_display;
+
+DELETE FROM contributor_track_display;
+
 -- these table are created by the Fulltext Search plugin
 DROP TABLE IF EXISTS fulltext;
 DROP TABLE IF EXISTS fulltext_terms;
@@ -40,4 +46,4 @@ UPDATE metainformation SET value = 0 WHERE name = 'lastRescanTime';
 -- start the contributor ID at the old offset to prevent ID overlap between scans
 UPDATE SQLITE_SEQUENCE SET seq = (SELECT old.seq FROM old_autoincrement AS old WHERE old.name = 'contributors') WHERE name = 'contributors';
 
-DROP TABLE old_autoincrement;
+DROP TABLE old_autoincrement;

SQL/mysql/schema_27_up.sql

@@ -0,0 +1,36 @@
+-- full relational solution for display_artist. 
+
+DROP TABLE IF EXISTS contributor_display;
+CREATE TABLE contributor_display (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  name blob);
+ALTER TABLE albums ADD display_contributor integer;
+
+DROP TABLE IF EXISTS contributor_album_display;
+CREATE TABLE contributor_album_display (
+  contributor_display  int(10),
+  contributor  int(10),
+  album  int(10),
+  PRIMARY KEY (contributor_display,contributor,album),
+  FOREIGN KEY (`album`) REFERENCES `albums` (`id`) ON DELETE CASCADE,
+  FOREIGN KEY (`contributor`) REFERENCES `contributors` (`id`) ON DELETE CASCADE
+);
+CREATE INDEX contributor_album_displayContribIndex ON contributor_album_display (contributor);
+CREATE INDEX contributor_album_displayAlbumIndex ON contributor_album_display (album);
+CREATE INDEX contributor_album_displayContributorDisplayIndex ON contributor_album_display (contributor_display);
+
+ALTER TABLE tracks ADD display_contributor integer;
+
+DROP TABLE IF EXISTS contributor_track_display;
+CREATE TABLE contributor_track_display (
+  contributor_display  int(10),
+  contributor  int(10),
+  track int(10),
+  PRIMARY KEY (contributor_display,contributor,track),
+  FOREIGN KEY (`track`) REFERENCES `tracks` (`id`) ON DELETE CASCADE,
+  FOREIGN KEY (`contributor`) REFERENCES `contributors` (`id`) ON DELETE CASCADE
+);
+CREATE INDEX contributor_track_displayContribIndex ON contributor_track_display (contributor);
+CREATE INDEX contributor_track_displayTrackIndex ON contributor_track_display (track);
+CREATE INDEX contributor_track_displayContributorDisplayIndex ON contributor_track_display (contributor_display);
+

SQL/mysql/schema_clear.sql

@@ -29,6 +29,12 @@ DELETE FROM scanned_files;
 
 DELETE FROM works;
 
+DELETE FROM contributor_display;
+
+DELETE FROM contributor_album_display;
+
+DELETE FROM contributor_track_display;
+
 UPDATE metainformation SET value = 0 WHERE name = 'lastRescanTime';
 
 UPDATE tracks_persistent SET track = NULL;

Slim/Control/Queries.pm

@@ -646,6 +646,9 @@ sub albumsQuery {
 		# We need the main albums.contributor name for favorites, so always do this join unless getting count only.
 		$sql .= 'JOIN contributors ON contributors.id = albums.contributor ';
 		$c->{'contributors.name'} = 1;
+		$c->{'albums.label'} = 1;
+		$sql .= 'LEFT JOIN contributor_display ON albums.display_contributor = contributor_display.id ';
+		$c->{'contributor_display.name'} = 1;
 	}
 
 	if ( $tags =~ /s/ ) {
@@ -836,6 +839,7 @@ sub albumsQuery {
 			utf8::decode( $c->{'composer.name'} ) if exists $c->{'composer.name'};
 			utf8::decode( $c->{'tracks.performance'} ) if exists $c->{'tracks.performance'};
 			utf8::decode( $c->{'contributors.name'} ) if exists $c->{'contributors.name'};
+			utf8::decode( $c->{'contributor_display.name'} ) if exists $c->{'contributor_display.name'};
 			$request->addResultLoop($loopname, $chunkCount, 'id', $c->{'albums.id'});
 			$request->addResultLoopIfValueDefined($loopname, $chunkCount, 'work_id', $c->{'tracks.work'});
 			$request->addResultLoopIfValueDefined($loopname, $chunkCount, 'work_name', $c->{'works.title'});
@@ -899,6 +903,7 @@ sub albumsQuery {
 			if ( !$work ) {
 				$tags =~ /S/ && $request->addResultLoopIfValueDefined($loopname, $chunkCount, 'artist_id', $c->{'albums.contributor'});
 				$tags =~ /a/ && $request->addResultLoopIfValueDefined($loopname, $chunkCount, 'artist', $c->{'contributors.name'});
+				$tags =~ /a/ && $c->{'contributor_display.name'} && $request->addResultLoopIfValueDefined($loopname, $chunkCount, 'display_artist', $c->{'contributor_display.name'});
 				$tags =~ /4/ && $request->addResultLoopIfValueDefined($loopname, $chunkCount, 'portraitid', $c->{'contributors.portraitid'});
 			}
 
@@ -5794,6 +5799,9 @@ sub _songDataFromHash {
 					$returnHash{$role} = $res->{$role};
 				}
 			}
+			$returnHash{display_trackartist} = $res->{'tacd.name'} if $res->{'tacd.name'};
+			$returnHash{display_artist} = $res->{'tacd.name'} if $res->{'tacd.name'};
+			$returnHash{display_albumartist} = $res->{'aacd.name'} if $res->{'aacd.name'};
 		}
 		elsif ( $tag eq 'S' ) {
 			for my $role ( @contributorRoles ) {
@@ -6397,6 +6405,19 @@ sub _getTagDataForTracks {
 		}
 	};
 
+	my $join_contributor_display = sub {
+		if ( $sql !~ /JOIN contributor_display AS aacd/ ) {
+			$join_albums->();
+			$sql .= 'LEFT JOIN contributor_display AS aacd ON albums.display_contributor = aacd.id ';
+		}
+	};
+
+	my $join_track_contributor_display = sub {
+		if ( $sql !~ /JOIN contributor_display AS tacd/ ) {
+			$sql .= 'LEFT JOIN contributor_display AS tacd ON tracks.display_contributor = tacd.id ';
+		}
+	};
+
 	if ( my $year = $args->{year} ) {
 		push @{$w}, 'tracks.year = ?';
 		push @{$p}, $year;
@@ -6521,6 +6542,13 @@ sub _getTagDataForTracks {
 		push @{$w}, 'contributor_track.role IN (' . join(', ', map {'?'} @roles) . ')';
 	};
 
+	$tags =~ /A/ && do {
+		$join_contributor_display->();
+		$join_track_contributor_display->();
+		$c->{'aacd.name'} = 1;
+		$c->{'tacd.name'} = 1;
+	};
+
 	$tags =~ /s/ && do {
 		$join_contributors->();
 		$c->{'contributors.id'} = 1;
@@ -6661,6 +6689,8 @@ sub _getTagDataForTracks {
 			utf8::decode( $c->{'tracks.lyrics'} ) if exists $c->{'tracks.lyrics'};
 			utf8::decode( $c->{'albums.title'} ) if exists $c->{'albums.title'};
 			utf8::decode( $c->{'contributors.name'} ) if exists $c->{'contributors.name'};
+			utf8::decode( $c->{'aacd.name'} ) if exists $c->{'aacd.name'};
+			utf8::decode( $c->{'tacd.name'} ) if exists $c->{'tacd.name'};
 			utf8::decode( $c->{'genres.name'} ) if exists $c->{'genres.name'};
 			utf8::decode( $c->{'comments.value'} ) if exists $c->{'comments.value'};
 			utf8::decode( $c->{'tracks.discsubtitle'}) if exists $c->{'tracks.discsubtitle'};

Slim/Plugin/FullTextSearch/Plugin.pm

@@ -35,7 +35,8 @@ use constant SQL_CREATE_TRACK_ITEM => q{
 		UNIQUE_TOKENS(LOWER(IFNULL(tracks.title, '')) || ' ' || IFNULL(tracks.titlesearch, '') || ' ' || IFNULL(tracks.customsearch, '')),
 		-- weight 5
 		UNIQUE_TOKENS(IFNULL(tracks.year, '') || ' ' || GROUP_CONCAT(albums.title, ' ') || ' ' || GROUP_CONCAT(albums.titlesearch, ' ') || ' '
-			|| GROUP_CONCAT(genres.name, ' ') || ' ' || GROUP_CONCAT(genres.namesearch, ' ')),
+			|| GROUP_CONCAT(genres.name, ' ') || ' ' || GROUP_CONCAT(genres.namesearch, ' ') || ' '
+			|| IFNULL(tcd.name, '') || ' ' || IFNULL(acd.name, '')),
 		-- weight 3 - contributors create multiple hits, therefore only w3
 		UNIQUE_TOKENS(CONCAT_CONTRIBUTOR_ROLE(tracks.id, GROUP_CONCAT(contributor_track.contributor, ','), 'contributor_track') || ' '
 			|| IGNORE_CASE(comments.value) || ' ' || IGNORE_CASE(tracks.lyrics) || ' ' || IFNULL(tracks.content_type, '') || ' '
@@ -52,6 +53,8 @@ use constant SQL_CREATE_TRACK_ITEM => q{
 		LEFT JOIN genre_track ON genre_track.track = tracks.id
 		LEFT JOIN genres ON genres.id = genre_track.genre
 		LEFT JOIN comments ON comments.track = tracks.id
+		LEFT JOIN contributor_display AS acd ON albums.display_contributor = acd.id
+		LEFT JOIN contributor_display AS tcd ON tracks.display_contributor = tcd.id
 
 		%s
 
@@ -112,7 +115,7 @@ use constant SQL_CREATE_ALBUM_ITEM => qq{
 		UNIQUE_TOKENS(LOWER(IFNULL(albums.title, '')) || ' ' || IFNULL(albums.titlesearch, '') || ' ' || IFNULL(albums.customsearch, '') || ' '
 		|| IFNULL((SELECT GROUP_CONCAT(wt,' ') FROM (SELECT DISTINCT works.titlesearch wt FROM tracks JOIN works ON tracks.work = works.id WHERE tracks.album = albums.id) ), ' ') ),
 		-- weight 5
-		IFNULL(albums.year, ''),
+		UNIQUE_TOKENS(IFNULL(albums.year, '') || ' ' || IFNULL(contributor_display.name, '')),
 		-- weight 3
 		UNIQUE_TOKENS(CONCAT_CONTRIBUTOR_ROLE(albums.id, GROUP_CONCAT(contributor_album.contributor, ','), 'contributor_album')),
 		-- weight 1
@@ -122,6 +125,7 @@ use constant SQL_CREATE_ALBUM_ITEM => qq{
 		FROM albums
 		LEFT JOIN contributor_album ON contributor_album.album = albums.id
 		LEFT JOIN contributors ON contributors.id = contributor_album.contributor
+		LEFT JOIN contributor_display ON albums.display_contributor = contributor_display.id
 
 		%s