arian/navidrome
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix artist folder detection. Now works when the artist has only one album.

Browse Source
This commit is contained in:
Deluan
2023-01-14 14:36:27 -05:00
parent d3e4a5287d
commit e3496c7eea
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/artwork/reader_artist.go
+4 -1
View File
@@ -55,6 +55,9 @@ func newArtistReader(ctx context.Context, artwork *artwork, artID model.ArtworkI
} }
a.files = strings.Join(files, string(filepath.ListSeparator)) a.files = strings.Join(files, string(filepath.ListSeparator))
a.artistFolder = utils.LongestCommonPrefix(paths) a.artistFolder = utils.LongestCommonPrefix(paths)
if !strings.HasSuffix(a.artistFolder, string(filepath.Separator)) {
a.artistFolder, _ = filepath.Split(a.artistFolder)
}
a.cacheKey.artID = artID a.cacheKey.artID = artID
return a, nil return a, nil
} }
@@ -92,7 +95,7 @@ func fromArtistFolder(ctx context.Context, artistFolder string, pattern string)
return nil, "", err return nil, "", err
} }
if len(matches) == 0 { if len(matches) == 0 {
return nil, "", fmt.Errorf(`no matches for "%s" in %s`, pattern, artistFolder) return nil, "", fmt.Errorf(`no matches for '%s' in '%s'`, pattern, artistFolder)
} }
filePath := filepath.Join(artistFolder, matches[0]) filePath := filepath.Join(artistFolder, matches[0])
f, err := os.Open(filePath) f, err := os.Open(filePath)