fix substring checking in scanner musicDirRelative

related https://github.com/sentriz/gonic/issues/437
2023-12-22 12:59:48 +00:00
parent 6b5195c583
commit f5b6b4d790
2 changed files with 24 additions and 1 deletions
--- a/scanner/scanner.go
+++ b/scanner/scanner.go
@@ -721,7 +721,7 @@ func parseMulti(parser tagcommon.Info, setting MultiValueSetting, getMulti func(

 func musicDirRelative(musicDirs []string, absPath string) (musicDir, relPath string) {
 	for _, musicDir := range musicDirs {
-		if strings.HasPrefix(absPath, musicDir) {
+		if absPath == musicDir || strings.HasPrefix(absPath, filepath.Clean(musicDir)+string(filepath.Separator)) { // ensure trailing slash for substring check
 			relPath, _ = filepath.Rel(musicDir, absPath)
 			return musicDir, relPath
 		}