KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Allow cancelling walker

Browse source
This commit is contained in:
Alexander Neumann 2015-03-02 19:44:16 +01:00
parent f167366be5
commit 03bdbb064f
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pipe/pipe.go
View file

@ -1,6 +1,7 @@
package pipe package pipe
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
@ -50,6 +51,8 @@ func isFile(fi os.FileInfo) bool {
return fi.Mode()&(os.ModeType|os.ModeCharDevice) == 0 return fi.Mode()&(os.ModeType|os.ModeCharDevice) == 0
} }
var errCancelled = errors.New("walk cancelled")
func walk(path string, done chan struct{}, jobs chan<- interface{}, res chan<- interface{}) error { func walk(path string, done chan struct{}, jobs chan<- interface{}, res chan<- interface{}) error {
info, err := os.Lstat(path) info, err := os.Lstat(path)
if err != nil { if err != nil {
@ -57,7 +60,11 @@ func walk(path string, done chan struct{}, jobs chan<- interface{}, res chan<- i
} }
if !info.IsDir() { if !info.IsDir() {
jobs <- Entry{Info: info, Path: path, Result: res} select {
case jobs <- Entry{Info: info, Path: path, Result: res}:
case <-done:
return errCancelled
}
return nil return nil
} }
@ -76,8 +83,12 @@ func walk(path string, done chan struct{}, jobs chan<- interface{}, res chan<- i
fi, err := os.Lstat(subpath) fi, err := os.Lstat(subpath)
if err != nil { if err != nil {
// entCh <- Entry{Info: fi, Error: err, Result: ch} select {
return err case jobs <- Entry{Info: fi, Error: err, Result: ch}:
case <-done:
return errCancelled
}
continue
} }
if isDir(fi) { if isDir(fi) {
@ -87,11 +98,19 @@ func walk(path string, done chan struct{}, jobs chan<- interface{}, res chan<- i
} }
} else { } else {
jobs <- Entry{Info: fi, Path: subpath, Result: ch} select {
case jobs <- Entry{Info: fi, Path: subpath, Result: ch}:
case <-done:
return errCancelled
}
} }
} }
jobs <- Dir{Path: path, Info: info, Entries: entries, Result: res} select {
case jobs <- Dir{Path: path, Info: info, Entries: entries, Result: res}:
case <-done:
return errCancelled
}
return nil return nil
} }