Merge pull request pkg#311 from danfletcher1/master

eikenb · web-flow · commit 515578a96784 · 2019-10-21T22:40:01.000-07:00
Bug with sub folders/files of a renamed/removed path
diff --git a/request-example.go b/request-example.go
@@ -11,6 +11,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strings"
 	"sync"
 	"syscall"
 	"time"
@@ -90,12 +91,36 @@ func (fs *root) Filecmd(r *Request) error {
 		file.name = r.Target
 		fs.files[r.Target] = file
 		delete(fs.files, r.Filepath)
+
+		if file.IsDir() {
+			for path, file := range fs.files {
+				if strings.HasPrefix(path, r.Filepath+"/") {
+					file.name = r.Target + path[len(r.Filepath):]
+					fs.files[r.Target+path[len(r.Filepath):]] = file
+					delete(fs.files, path)
+				}
+			}
+		}
 	case "Rmdir", "Remove":
-		_, err := fs.fetch(filepath.Dir(r.Filepath))
+		file, err := fs.fetch(filepath.Dir(r.Filepath))
 		if err != nil {
 			return err
 		}
+
+		if file.IsDir() {
+			for path := range fs.files {
+				if strings.HasPrefix(path, r.Filepath+"/") {
+					return &os.PathError{
+						Op:   "remove",
+						Path: r.Filepath + "/",
+						Err:  fmt.Errorf("directory is not empty"),
+					}
+				}
+			}
+		}
+
 		delete(fs.files, r.Filepath)
+
 	case "Mkdir":
 		_, err := fs.fetch(filepath.Dir(r.Filepath))
 		if err != nil {
