mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-03 04:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

chore(scanner): add logs to .ndignore processing

Browse source 
Signed-off-by: Deluan <deluan@navidrome.org>
This commit is contained in:
Deluan 2025-03-14 17:44:00 -04:00
parent 938c3d44cc
commit 422ba2284e
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scanner/walk_dir_tree.go
View file

@ -145,7 +145,10 @@ func loadIgnoredPatterns(ctx context.Context, fsys fs.FS, currentFolder string,
} }
// If the .ndignore file is empty, mimic the current behavior and ignore everything // If the .ndignore file is empty, mimic the current behavior and ignore everything
if len(newPatterns) == 0 { if len(newPatterns) == 0 {
log.Trace(ctx, "Scanner: .ndignore file is empty, ignoring everything", "path", currentFolder)
newPatterns = []string{"**/*"} newPatterns = []string{"**/*"}
} else {
log.Trace(ctx, "Scanner: .ndignore file found ", "path", ignoreFilePath, "patterns", newPatterns)
} }
} }
// Combine the patterns from the .ndignore file with the ones passed as argument // Combine the patterns from the .ndignore file with the ones passed as argument
@ -180,7 +183,7 @@ func loadDir(ctx context.Context, job *scanJob, dirPath string, ignorePatterns [
children = make([]string, 0, len(entries)) children = make([]string, 0, len(entries))
for _, entry := range entries { for _, entry := range entries {
entryPath := path.Join(dirPath, entry.Name()) entryPath := path.Join(dirPath, entry.Name())
if len(ignorePatterns) > 0 && isScanIgnored(ignoreMatcher, entryPath) { if len(ignorePatterns) > 0 && isScanIgnored(ctx, ignoreMatcher, entryPath) {
log.Trace(ctx, "Scanner: Ignoring entry", "path", entryPath) log.Trace(ctx, "Scanner: Ignoring entry", "path", entryPath)
continue continue
} }
@ -309,6 +312,10 @@ func isEntryIgnored(name string) bool {
return strings.HasPrefix(name, ".") && !strings.HasPrefix(name, "..") return strings.HasPrefix(name, ".") && !strings.HasPrefix(name, "..")
} }
func isScanIgnored(matcher *ignore.GitIgnore, entryPath string) bool { func isScanIgnored(ctx context.Context, matcher *ignore.GitIgnore, entryPath string) bool {
return matcher.MatchesPath(entryPath) matches := matcher.MatchesPath(entryPath)
if matches {
log.Trace(ctx, "Scanner: Ignoring entry matching .ndignore: ", "path", entryPath)
}
return matches
} }