MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-15 16:48:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rework album_artist/album_artist_sort handling

Browse Source 
artist_sort tends to be more and more widespread, so try to reuse artist_sort
if possible instead of deriving album_artist_sort from album_artist
unconditionally.
This commit is contained in:
Julien BLACHE 2011-04-07 19:53:55 +02:00
parent 54c5314712
commit a576033497
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/filescanner.c
View File

@ -259,20 +259,27 @@ fixup_tags(struct media_file_info *mfi)
if (!mfi->title) if (!mfi->title)
mfi->title = strdup(mfi->fname); mfi->title = strdup(mfi->fname);
/* If we don't have an album_artist, set it to artist */
if (!mfi->album_artist)
{
if (mfi->compilation)
mfi->album_artist = strdup("");
else
mfi->album_artist = strdup(mfi->artist);
}
/* Ensure sort tags are filled and normalized */ /* Ensure sort tags are filled and normalized */
normalize_fixup_tag(&mfi->artist_sort, mfi->artist); normalize_fixup_tag(&mfi->artist_sort, mfi->artist);
normalize_fixup_tag(&mfi->album_sort, mfi->album); normalize_fixup_tag(&mfi->album_sort, mfi->album);
normalize_fixup_tag(&mfi->title_sort, mfi->title); normalize_fixup_tag(&mfi->title_sort, mfi->title);
normalize_fixup_tag(&mfi->album_artist_sort, mfi->album_artist);
/* If we don't have an album_artist, set it to artist */
if (!mfi->album_artist)
{
if (mfi->compilation)
{
mfi->album_artist = strdup("");
mfi->album_artist_sort = strdup("");
}
else
mfi->album_artist = strdup(mfi->artist);
}
if (!mfi->album_artist_sort && (strcmp(mfi->album_artist, mfi->artist) == 0))
mfi->album_artist_sort = strdup(mfi->artist_sort);
else
normalize_fixup_tag(&mfi->album_artist_sort, mfi->album_artist);
/* Composer is not one of our mandatory tags, so take extra care */ /* Composer is not one of our mandatory tags, so take extra care */
if (mfi->composer_sort || mfi->composer) if (mfi->composer_sort || mfi->composer)