Small refactoring

This commit is contained in:
Deluan
2024-06-05 22:39:36 -04:00
parent abe5690018
commit 11bef060a3
5 changed files with 53 additions and 56 deletions
+13 -1
View File
@@ -8,6 +8,7 @@ import (
"github.com/deluan/sanitize"
"github.com/microcosm-cc/bluemonday"
"github.com/navidrome/navidrome/conf"
)
var quotesRegex = regexp.MustCompile("[“”‘’'\"\\[\\(\\{\\]\\)\\}]")
@@ -46,5 +47,16 @@ func SanitizeFieldForSorting(originalValue string) string {
func SanitizeFieldForSortingNoArticle(originalValue string) string {
v := strings.TrimSpace(sanitize.Accents(originalValue))
return strings.ToLower(NoArticle(v))
return strings.ToLower(RemoveArticle(v))
}
func RemoveArticle(name string) string {
articles := strings.Split(conf.Server.IgnoredArticles, " ")
for _, a := range articles {
n := strings.TrimPrefix(name, a+" ")
if n != name {
return n
}
}
return name
}