Skip to content

skip ignored files before callbacks #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
technoweenie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

skip ignored files before callbacks #100

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,16 +308,6 @@ func (w *Watcher) listRecursive(name string) (map[string]os.FileInfo, error) {
return err
}

for _, f := range w.ffh {
err := f(info, path)
if err == ErrSkip {
return nil
}
if err != nil {
return err
}
}

// If path is ignored and it's a directory, skip the directory. If it's
// ignored and it's a single file, skip the file.
_, ignored := w.ignored[path]
Expand All @@ -333,6 +323,17 @@ func (w *Watcher) listRecursive(name string) (map[string]os.FileInfo, error) {
}
return nil
}

for _, f := range w.ffh {
err := f(info, path)
if err == ErrSkip {
return nil
}
if err != nil {
return err
}
}

// Add the path and it's info to the file list.
fileList[path] = info
return nil
Expand Down