backend: Only return top-level files for most dirs

Fixes #1478
2017-12-14 19:13:01 +01:00 · 2017-12-14 19:13:01 +01:00 · 7d8765a937
commit 7d8765a937
parent 42a8c19aae
12 changed files with 49 additions and 15 deletions
--- a/internal/backend/sftp/sftp.go
+++ b/internal/backend/sftp/sftp.go
@ -455,12 +455,22 @@ func (r *SFTP) List(ctx context.Context, t restic.FileType) <-chan string {
 	go func() {
 		defer close(ch)

-		walker := r.c.Walk(r.Basedir(t))
+		basedir, subdirs := r.Basedir(t)
+		walker := r.c.Walk(basedir)
 		for walker.Step() {
 			if walker.Err() != nil {
 				continue
 			}

+			if walker.Path() == basedir {
+				continue
+			}
+
+			if walker.Stat().IsDir() && !subdirs {
+				walker.SkipDir()
+				continue
+			}
+
 			if !walker.Stat().Mode().IsRegular() {
 				continue
 			}