MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 06:33:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ignore article (The/A/An) when sorting

Browse Source
This commit is contained in:
ejurgensen 2013-12-02 22:20:34 +01:00
parent 161338752c
commit 26fe40cb18
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/filescanner.c
View File

@ -171,6 +171,34 @@ normalize_fixup_tag(char **tag, char *src_tag)
} }
} }
static char *
strip_article(char *tag)
{
int len;
if (!tag)
return NULL;
len = strlen(tag);
if ((strncmp(tag, "A ", 2) == 0) && (len > 2))
return tag + 2;
if ((strncmp(tag, "An ", 3) == 0) && (len > 3))
return tag + 3;
if ((strncmp(tag, "AN ", 3) == 0) && (len > 3))
return tag + 3;
if ((strncmp(tag, "The ", 4) == 0) && (len > 4))
return tag + 4;
if ((strncmp(tag, "THE ", 4) == 0) && (len > 4))
return tag + 4;
return tag;
}
static void static void
fixup_tags(struct media_file_info *mfi) fixup_tags(struct media_file_info *mfi)
{ {
@ -287,10 +315,10 @@ fixup_tags(struct media_file_info *mfi)
mfi->title = strdup(mfi->fname); mfi->title = strdup(mfi->fname);
} }
/* Ensure sort tags are filled and normalized */ /* Ensure sort tags are filled and normalized, and that "The"/"A"/"An" are stripped */
normalize_fixup_tag(&mfi->artist_sort, mfi->artist); normalize_fixup_tag(&mfi->artist_sort, strip_article(mfi->artist));
normalize_fixup_tag(&mfi->album_sort, mfi->album); normalize_fixup_tag(&mfi->album_sort, strip_article(mfi->album));
normalize_fixup_tag(&mfi->title_sort, mfi->title); normalize_fixup_tag(&mfi->title_sort, strip_article(mfi->title));
/* We need to set album_artist according to media type and config */ /* We need to set album_artist according to media type and config */
if (mfi->compilation) /* Compilation */ if (mfi->compilation) /* Compilation */