Display artist

Changelog9.html

@@ -10,6 +10,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>
 		<li><a href="https://github.com/LMS-Community/slimserver/pull/1605">#1605</a> - MusicMagic: add configurable host for remote MusicIP instances (@jonstahl)</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;