tag/Fallback: add tag fallbacks for AlbumArtistSort, ArtistSort

Just like AlbumArtist falls back to Artist, AlbumArtistSort should fall back tom AlbumArtist, ArtistSort and finally Artist. Closes #355

tag/Fallback: add tag fallbacks for AlbumArtistSort, ArtistSort
53448e46 · Max Kellermann · 21adc787 · 53448e46 · 53448e46
Commit 53448e46 authored Oct 22, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 2 deletions

NEWS NEWS +2 -0

Fallback.hxx src/tag/Fallback.hxx +12 -2

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.20.22 (not yet released)
+* protocol
+  - add tag fallbacks for AlbumArtistSort, ArtistSort
 * storage
  - curl: URL-encode paths
 * Android

--- a/src/tag/Fallback.hxx
+++ b/src/tag/Fallback.hxx
@@ -26,8 +26,18 @@ template<typename F>
 bool
 ApplyTagFallback(TagType type, F &&f) noexcept
 {
-	if (type == TAG_ALBUM_ARTIST)
-		/* fall back to "Artist" if no "AlbumArtist" was found */
+	if (type == TAG_ALBUM_ARTIST_SORT) {
+		/* fall back to "AlbumArtist", "ArtistSort" and
+		   "Artist" if no "AlbumArtistSort" was found */
+		if (f(TAG_ALBUM_ARTIST))
+			return true;
+
+		return ApplyTagFallback(TAG_ARTIST_SORT, std::forward<F>(f));
+	}
+
+	if (type == TAG_ALBUM_ARTIST || type == TAG_ARTIST_SORT)
+		/* fall back to "Artist" if no
+		   "AlbumArtist"/"ArtistSort" was found */
 		return f(TAG_ARTIST);

 	return false;