Merge pull request #82 from go-zero-boilerplate/master
Revert previous fullPath changes - add tests for nested BasePaths
diff --git a/basepath.go b/basepath.go
index 9e5bf6f..6ec6ca9 100644
--- a/basepath.go
+++ b/basepath.go
@@ -42,24 +42,6 @@
return path, nil
}
-func (b *BasePathFs) fullPath(name string) (path string, err error) {
- if err := validateBasePathName(name); err != nil {
- return "", err
- }
-
- bpath := filepath.Clean(b.path)
- path = filepath.Clean(filepath.Join(bpath, name))
- if !strings.HasPrefix(path, bpath) {
- return name, os.ErrNotExist
- }
-
- if parentBasePathFs, ok := b.source.(*BasePathFs); ok {
- return parentBasePathFs.fullPath(path)
- }
-
- return path, nil
-}
-
func validateBasePathName(name string) error {
if runtime.GOOS != "windows" {
// Not much to do here;
@@ -77,14 +59,14 @@
}
func (b *BasePathFs) Chtimes(name string, atime, mtime time.Time) (err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return &os.PathError{"chtimes", name, err}
}
return b.source.Chtimes(name, atime, mtime)
}
func (b *BasePathFs) Chmod(name string, mode os.FileMode) (err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return &os.PathError{"chmod", name, err}
}
return b.source.Chmod(name, mode)
@@ -95,66 +77,66 @@
}
func (b *BasePathFs) Stat(name string) (fi os.FileInfo, err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return nil, &os.PathError{"stat", name, err}
}
return b.source.Stat(name)
}
func (b *BasePathFs) Rename(oldname, newname string) (err error) {
- if oldname, err = b.fullPath(oldname); err != nil {
+ if oldname, err = b.RealPath(oldname); err != nil {
return &os.PathError{"rename", oldname, err}
}
- if newname, err = b.fullPath(newname); err != nil {
+ if newname, err = b.RealPath(newname); err != nil {
return &os.PathError{"rename", newname, err}
}
return b.source.Rename(oldname, newname)
}
func (b *BasePathFs) RemoveAll(name string) (err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return &os.PathError{"remove_all", name, err}
}
return b.source.RemoveAll(name)
}
func (b *BasePathFs) Remove(name string) (err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return &os.PathError{"remove", name, err}
}
return b.source.Remove(name)
}
func (b *BasePathFs) OpenFile(name string, flag int, mode os.FileMode) (f File, err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return nil, &os.PathError{"openfile", name, err}
}
return b.source.OpenFile(name, flag, mode)
}
func (b *BasePathFs) Open(name string) (f File, err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return nil, &os.PathError{"open", name, err}
}
return b.source.Open(name)
}
func (b *BasePathFs) Mkdir(name string, mode os.FileMode) (err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return &os.PathError{"mkdir", name, err}
}
return b.source.Mkdir(name, mode)
}
func (b *BasePathFs) MkdirAll(name string, mode os.FileMode) (err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return &os.PathError{"mkdir", name, err}
}
return b.source.MkdirAll(name, mode)
}
func (b *BasePathFs) Create(name string) (f File, err error) {
- if name, err = b.fullPath(name); err != nil {
+ if name, err = b.RealPath(name); err != nil {
return nil, &os.PathError{"create", name, err}
}
return b.source.Create(name)
diff --git a/basepath_test.go b/basepath_test.go
index e9c0cfd..d0ddf12 100644
--- a/basepath_test.go
+++ b/basepath_test.go
@@ -99,6 +99,7 @@
dirSpec{Dir1: "/", Dir2: "/", Dir3: "/"},
dirSpec{Dir1: "/", Dir2: "/path2", Dir3: "/"},
dirSpec{Dir1: "/path1/dir", Dir2: "/path2/dir/", Dir3: "/path3/dir"},
+ dirSpec{Dir1: "C:/path1", Dir2: "path2/dir", Dir3: "/path3/dir/"},
}
for _, ds := range dirSpecs {
@@ -119,10 +120,23 @@
}
for _, s := range specs {
- if actualPath, err := s.BaseFs.(*BasePathFs).fullPath(s.FileName); err != nil {
+ if err := s.BaseFs.MkdirAll(s.FileName, 0755); err != nil {
t.Errorf("Got error %s", err.Error())
- } else if actualPath != s.ExpectedPath {
- t.Errorf("Expected \n%s got \n%s", s.ExpectedPath, actualPath)
+ }
+ if _, err := s.BaseFs.Stat(s.FileName); err != nil {
+ t.Errorf("Got error %s", err.Error())
+ }
+
+ if s.BaseFs == level3Fs {
+ pathToExist := filepath.Join(ds.Dir3, s.FileName)
+ if _, err := level2Fs.Stat(pathToExist); err != nil {
+ t.Errorf("Got error %s (path %s)", err.Error(), pathToExist)
+ }
+ } else if s.BaseFs == level2Fs {
+ pathToExist := filepath.Join(ds.Dir2, ds.Dir3, s.FileName)
+ if _, err := level1Fs.Stat(pathToExist); err != nil {
+ t.Errorf("Got error %s (path %s)", err.Error(), pathToExist)
+ }
}
}
}
