forked from mirror/afero
Compare commits
No commits in common. "master" and "feat/githubaction" have entirely different histories.
master
...
feat/githu
|
|
@ -8,7 +8,8 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
go-version: [1.16.x,1.17.x,1.18.x]
|
||||
platform: [ubuntu-latest, macos-latest, windows-latest]
|
||||
# TODO(bep) fix windows-latest
|
||||
platform: [ubuntu-latest, macos-latest]
|
||||
runs-on: ${{ matrix.platform }}
|
||||
steps:
|
||||
- name: Install Go
|
||||
|
|
@ -24,14 +25,14 @@ jobs:
|
|||
shell: bash
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v1
|
||||
- name: Fmt
|
||||
if: matrix.platform != 'windows-latest' # :(
|
||||
run: "diff <(gofmt -d .) <(printf '')"
|
||||
shell: bash
|
||||
#- name: Fmt
|
||||
# if: matrix.platform != 'windows-latest' # :(
|
||||
# run: "diff <(gofmt -d .) <(printf '')"
|
||||
# shell: bash
|
||||
- name: Vet
|
||||
run: go vet ./...
|
||||
- name: Staticcheck
|
||||
if: matrix.go-version != '1.16.x'
|
||||
run: staticcheck ./...
|
||||
#- name: Staticcheck
|
||||
# if: matrix.go-version != '1.16.x'
|
||||
# run: staticcheck ./...
|
||||
- name: Test
|
||||
run: go test -race ./...
|
||||
12
README.md
12
README.md
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
A FileSystem Abstraction System for Go
|
||||
|
||||
[](https://git.internal/re/afero/actions/workflows/test.yml) [](https://godoc.org/git.internal/re/afero) [](https://gitter.im/spf13/afero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
[](https://travis-ci.org/spf13/afero) [](https://ci.appveyor.com/project/spf13/afero) [](https://godoc.org/github.com/spf13/afero) [](https://gitter.im/spf13/afero?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
|
||||
# Overview
|
||||
|
||||
|
|
@ -50,11 +50,11 @@ A few different ways you could use Afero:
|
|||
|
||||
First use go get to install the latest version of the library.
|
||||
|
||||
$ go get git.internal/re/afero
|
||||
$ go get github.com/spf13/afero
|
||||
|
||||
Next include Afero in your application.
|
||||
```go
|
||||
import "git.internal/re/afero"
|
||||
import "github.com/spf13/afero"
|
||||
```
|
||||
|
||||
## Step 2: Declare a backend
|
||||
|
|
@ -152,7 +152,7 @@ Walk(root string, walkFn filepath.WalkFunc) error
|
|||
WriteFile(filename string, data []byte, perm os.FileMode) error
|
||||
WriteReader(path string, r io.Reader) (err error)
|
||||
```
|
||||
For a complete list see [Afero's GoDoc](https://godoc.org/git.internal/re/afero)
|
||||
For a complete list see [Afero's GoDoc](https://godoc.org/github.com/spf13/afero)
|
||||
|
||||
They are available under two different approaches to use. You can either call
|
||||
them directly where the first parameter of each function will be the file
|
||||
|
|
@ -417,7 +417,7 @@ Googles very well.
|
|||
|
||||
## Release Notes
|
||||
|
||||
See the [Releases Page](https://git.internal/re/afero/releases).
|
||||
See the [Releases Page](https://github.com/spf13/afero/releases).
|
||||
|
||||
## Contributing
|
||||
|
||||
|
|
@ -439,4 +439,4 @@ Names in no particular order:
|
|||
## License
|
||||
|
||||
Afero is released under the Apache 2.0 license. See
|
||||
[LICENSE.txt](https://git.internal/re/afero/blob/master/LICENSE.txt)
|
||||
[LICENSE.txt](https://github.com/spf13/afero/blob/master/LICENSE.txt)
|
||||
|
|
|
|||
4
afero.go
4
afero.go
|
|
@ -103,8 +103,8 @@ type Fs interface {
|
|||
|
||||
var (
|
||||
ErrFileClosed = errors.New("File is closed")
|
||||
ErrOutOfRange = errors.New("out of range")
|
||||
ErrTooLarge = errors.New("too large")
|
||||
ErrOutOfRange = errors.New("Out of range")
|
||||
ErrTooLarge = errors.New("Too large")
|
||||
ErrFileNotFound = os.ErrNotExist
|
||||
ErrFileExists = os.ErrExist
|
||||
ErrDestinationExists = os.ErrExist
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ import (
|
|||
"bytes"
|
||||
"fmt"
|
||||
"io"
|
||||
iofs "io/fs"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
|
@ -28,10 +27,8 @@ import (
|
|||
"testing"
|
||||
)
|
||||
|
||||
var (
|
||||
testName = "test.txt"
|
||||
Fss = []Fs{&MemMapFs{}, &OsFs{}}
|
||||
)
|
||||
var testName = "test.txt"
|
||||
var Fss = []Fs{&MemMapFs{}, &OsFs{}}
|
||||
|
||||
var testRegistry map[Fs][]string = make(map[Fs][]string)
|
||||
|
||||
|
|
@ -47,6 +44,7 @@ func testDir(fs Fs) string {
|
|||
|
||||
func tmpFile(fs Fs) File {
|
||||
x, err := TempFile(fs, "", "afero")
|
||||
|
||||
if err != nil {
|
||||
panic(fmt.Sprint("unable to work with temp file", err))
|
||||
}
|
||||
|
|
@ -56,7 +54,7 @@ func tmpFile(fs Fs) File {
|
|||
return x
|
||||
}
|
||||
|
||||
// Read with length 0 should not return EOF.
|
||||
//Read with length 0 should not return EOF.
|
||||
func TestRead0(t *testing.T) {
|
||||
for _, fs := range Fss {
|
||||
f := tmpFile(fs)
|
||||
|
|
@ -84,7 +82,7 @@ func TestOpenFile(t *testing.T) {
|
|||
tmp := testDir(fs)
|
||||
path := filepath.Join(tmp, testName)
|
||||
|
||||
f, err := fs.OpenFile(path, os.O_RDWR|os.O_CREATE, 0o600)
|
||||
f, err := fs.OpenFile(path, os.O_RDWR|os.O_CREATE, 0600)
|
||||
if err != nil {
|
||||
t.Error(fs.Name(), "OpenFile (O_CREATE) failed:", err)
|
||||
continue
|
||||
|
|
@ -92,7 +90,7 @@ func TestOpenFile(t *testing.T) {
|
|||
io.WriteString(f, "initial")
|
||||
f.Close()
|
||||
|
||||
f, err = fs.OpenFile(path, os.O_WRONLY|os.O_APPEND, 0o600)
|
||||
f, err = fs.OpenFile(path, os.O_WRONLY|os.O_APPEND, 0600)
|
||||
if err != nil {
|
||||
t.Error(fs.Name(), "OpenFile (O_APPEND) failed:", err)
|
||||
continue
|
||||
|
|
@ -100,7 +98,7 @@ func TestOpenFile(t *testing.T) {
|
|||
io.WriteString(f, "|append")
|
||||
f.Close()
|
||||
|
||||
f, _ = fs.OpenFile(path, os.O_RDONLY, 0o600)
|
||||
f, err = fs.OpenFile(path, os.O_RDONLY, 0600)
|
||||
contents, _ := ioutil.ReadAll(f)
|
||||
expectedContents := "initial|append"
|
||||
if string(contents) != expectedContents {
|
||||
|
|
@ -108,7 +106,7 @@ func TestOpenFile(t *testing.T) {
|
|||
}
|
||||
f.Close()
|
||||
|
||||
f, err = fs.OpenFile(path, os.O_RDWR|os.O_TRUNC, 0o600)
|
||||
f, err = fs.OpenFile(path, os.O_RDWR|os.O_TRUNC, 0600)
|
||||
if err != nil {
|
||||
t.Error(fs.Name(), "OpenFile (O_TRUNC) failed:", err)
|
||||
continue
|
||||
|
|
@ -334,7 +332,7 @@ func TestSeek(t *testing.T) {
|
|||
whence int
|
||||
out int64
|
||||
}
|
||||
tests := []test{
|
||||
var tests = []test{
|
||||
{0, 1, int64(len(data))},
|
||||
{0, 0, 0},
|
||||
{5, 0, 5},
|
||||
|
|
@ -425,7 +423,7 @@ func setupTestDirReusePath(t *testing.T, fs Fs, path string) string {
|
|||
|
||||
func setupTestFiles(t *testing.T, fs Fs, path string) string {
|
||||
testSubDir := filepath.Join(path, "more", "subdirectories", "for", "testing", "we")
|
||||
err := fs.MkdirAll(testSubDir, 0o700)
|
||||
err := fs.MkdirAll(testSubDir, 0700)
|
||||
if err != nil && !os.IsExist(err) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -532,43 +530,22 @@ func TestReaddirSimple(t *testing.T) {
|
|||
|
||||
func TestReaddir(t *testing.T) {
|
||||
defer removeAllTestFiles(t)
|
||||
const nums = 6
|
||||
for num := 0; num < nums; num++ {
|
||||
for num := 0; num < 6; num++ {
|
||||
outputs := make([]string, len(Fss))
|
||||
infos := make([]string, len(Fss))
|
||||
for i, fs := range Fss {
|
||||
testSubDir := setupTestDir(t, fs)
|
||||
//tDir := filepath.Dir(testSubDir)
|
||||
root, err := fs.Open(testSubDir)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
infosn := make([]string, nums)
|
||||
|
||||
for j := 0; j < nums; j++ {
|
||||
info, err := root.Readdir(num)
|
||||
outputs[i] += fmt.Sprintf("%v Error: %v\n", myFileInfo(info), err)
|
||||
s := fmt.Sprintln(len(info), err)
|
||||
infosn[j] = s
|
||||
infos[i] += s
|
||||
}
|
||||
root.Close()
|
||||
|
||||
// Also check fs.ReadDirFile interface if implemented
|
||||
if _, ok := root.(iofs.ReadDirFile); ok {
|
||||
root, err = fs.Open(testSubDir)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer root.Close()
|
||||
|
||||
for j := 0; j < nums; j++ {
|
||||
dirEntries, err := root.(iofs.ReadDirFile).ReadDir(num)
|
||||
s := fmt.Sprintln(len(dirEntries), err)
|
||||
if s != infosn[j] {
|
||||
t.Fatalf("%s: %s != %s", fs.Name(), s, infosn[j])
|
||||
}
|
||||
}
|
||||
for j := 0; j < 6; j++ {
|
||||
info, err := root.Readdir(num)
|
||||
outputs[i] += fmt.Sprintf("%v Error: %v\n", myFileInfo(info), err)
|
||||
infos[i] += fmt.Sprintln(len(info), err)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -593,7 +570,7 @@ func TestReaddir(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// https://git.internal/re/afero/issues/169
|
||||
// https://github.com/spf13/afero/issues/169
|
||||
func TestReaddirRegularFile(t *testing.T) {
|
||||
defer removeAllTestFiles(t)
|
||||
for _, fs := range Fss {
|
||||
|
|
@ -638,7 +615,7 @@ func TestReaddirAll(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
namesRoot := []string{}
|
||||
var namesRoot = []string{}
|
||||
for _, e := range rootInfo {
|
||||
namesRoot = append(namesRoot, e.Name())
|
||||
}
|
||||
|
|
@ -653,7 +630,7 @@ func TestReaddirAll(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
namesSub := []string{}
|
||||
var namesSub = []string{}
|
||||
for _, e := range subInfo {
|
||||
namesSub = append(namesSub, e.Name())
|
||||
}
|
||||
|
|
@ -723,7 +700,7 @@ func removeAllTestFiles(t *testing.T) {
|
|||
func equal(name1, name2 string) (r bool) {
|
||||
switch runtime.GOOS {
|
||||
case "windows":
|
||||
r = strings.EqualFold(name1, name2)
|
||||
r = strings.ToLower(name1) == strings.ToLower(name2)
|
||||
default:
|
||||
r = name1 == name2
|
||||
}
|
||||
|
|
|
|||
14
basepath.go
14
basepath.go
|
|
@ -1,7 +1,6 @@
|
|||
package afero
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
|
|
@ -9,10 +8,7 @@ import (
|
|||
"time"
|
||||
)
|
||||
|
||||
var (
|
||||
_ Lstater = (*BasePathFs)(nil)
|
||||
_ fs.ReadDirFile = (*BasePathFile)(nil)
|
||||
)
|
||||
var _ Lstater = (*BasePathFs)(nil)
|
||||
|
||||
// The BasePathFs restricts all operations to a given path within an Fs.
|
||||
// The given file name to the operations on this Fs will be prepended with
|
||||
|
|
@ -37,14 +33,6 @@ func (f *BasePathFile) Name() string {
|
|||
return strings.TrimPrefix(sourcename, filepath.Clean(f.path))
|
||||
}
|
||||
|
||||
func (f *BasePathFile) ReadDir(n int) ([]fs.DirEntry, error) {
|
||||
if rdf, ok := f.File.(fs.ReadDirFile); ok {
|
||||
return rdf.ReadDir(n)
|
||||
|
||||
}
|
||||
return readDirFile{f.File}.ReadDir(n)
|
||||
}
|
||||
|
||||
func NewBasePathFs(source Fs, path string) Fs {
|
||||
return &BasePathFs{source: source, path: path}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ func TestUnionCreateExisting(t *testing.T) {
|
|||
fh.Close()
|
||||
|
||||
fh, _ = base.Open("/home/test/file.txt")
|
||||
data, _ = ioutil.ReadAll(fh)
|
||||
data, err = ioutil.ReadAll(fh)
|
||||
if string(data) != "This is a test" {
|
||||
t.Errorf("Got wrong data in base file")
|
||||
}
|
||||
|
|
@ -326,9 +326,9 @@ func TestUnionCacheWrite(t *testing.T) {
|
|||
t.Errorf("Failed to write file")
|
||||
}
|
||||
|
||||
fh.Seek(0, io.SeekStart)
|
||||
fh.Seek(0, os.SEEK_SET)
|
||||
buf := make([]byte, 4)
|
||||
_, _ = fh.Read(buf)
|
||||
_, err = fh.Read(buf)
|
||||
fh.Write([]byte(" IS A"))
|
||||
fh.Close()
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
//go:build aix || darwin || openbsd || freebsd || netbsd || dragonfly
|
||||
// +build aix darwin openbsd freebsd netbsd dragonfly
|
||||
|
||||
package afero
|
||||
|
|
|
|||
|
|
@ -10,8 +10,12 @@
|
|||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//go:build !darwin && !openbsd && !freebsd && !dragonfly && !netbsd && !aix
|
||||
// +build !darwin,!openbsd,!freebsd,!dragonfly,!netbsd,!aix
|
||||
// +build !darwin
|
||||
// +build !openbsd
|
||||
// +build !freebsd
|
||||
// +build !dragonfly
|
||||
// +build !netbsd
|
||||
// +build !aix
|
||||
|
||||
package afero
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,9 @@ func TestCopyOnWrite(t *testing.T) {
|
|||
|
||||
compositeFs := NewCopyOnWriteFs(NewReadOnlyFs(NewOsFs()), osFs)
|
||||
|
||||
dir := filepath.Join(writeDir, "some/path")
|
||||
var dir = filepath.Join(writeDir, "some/path")
|
||||
|
||||
err = compositeFs.MkdirAll(dir, 0o744)
|
||||
err = compositeFs.MkdirAll(dir, 0744)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -27,17 +27,17 @@ func TestCopyOnWrite(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
// https://git.internal/re/afero/issues/189
|
||||
// https://github.com/spf13/afero/issues/189
|
||||
// We want the composite file system to behave like the OS file system
|
||||
// on Mkdir and MkdirAll
|
||||
for _, fs := range []Fs{osFs, compositeFs} {
|
||||
err = fs.Mkdir(dir, 0o744)
|
||||
err = fs.Mkdir(dir, 0744)
|
||||
if err == nil || !os.IsExist(err) {
|
||||
t.Errorf("Mkdir: Got %q for %T", err, fs)
|
||||
}
|
||||
|
||||
// MkdirAll does not return an error when the directory already exists
|
||||
err = fs.MkdirAll(dir, 0o744)
|
||||
err = fs.MkdirAll(dir, 0744)
|
||||
if err != nil {
|
||||
t.Errorf("MkdirAll: Got %q for %T", err, fs)
|
||||
}
|
||||
|
|
@ -49,7 +49,7 @@ func TestCopyOnWriteFileInMemMapBase(t *testing.T) {
|
|||
base := &MemMapFs{}
|
||||
layer := &MemMapFs{}
|
||||
|
||||
if err := WriteFile(base, "base.txt", []byte("base"), 0o755); err != nil {
|
||||
if err := WriteFile(base, "base.txt", []byte("base"), 0755); err != nil {
|
||||
t.Fatalf("Failed to write file: %s", err)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -302,9 +302,6 @@ func (fs *Fs) Remove(name string) error {
|
|||
}
|
||||
var infos []os.FileInfo
|
||||
infos, err = dir.Readdir(0)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if len(infos) > 0 {
|
||||
return syscall.ENOTEMPTY
|
||||
}
|
||||
|
|
@ -348,9 +345,6 @@ func (fs *Fs) RemoveAll(path string) error {
|
|||
|
||||
var infos []os.FileInfo
|
||||
infos, err = dir.Readdir(0)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, info := range infos {
|
||||
nameToRemove := fs.normSeparators(info.Name())
|
||||
err = fs.RemoveAll(path + fs.separator + nameToRemove)
|
||||
|
|
|
|||
14
gcsfs/gcs.go
14
gcsfs/gcs.go
|
|
@ -22,8 +22,8 @@ import (
|
|||
"time"
|
||||
|
||||
"cloud.google.com/go/storage"
|
||||
"git.internal/re/afero"
|
||||
"github.com/googleapis/google-cloud-go-testing/storage/stiface"
|
||||
"github.com/spf13/afero"
|
||||
|
||||
"google.golang.org/api/option"
|
||||
)
|
||||
|
|
@ -76,51 +76,39 @@ func NewGcsFSFromClientWithSeparator(ctx context.Context, client *storage.Client
|
|||
func (fs *GcsFs) Name() string {
|
||||
return fs.source.Name()
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Create(name string) (afero.File, error) {
|
||||
return fs.source.Create(name)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Mkdir(name string, perm os.FileMode) error {
|
||||
return fs.source.Mkdir(name, perm)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) MkdirAll(path string, perm os.FileMode) error {
|
||||
return fs.source.MkdirAll(path, perm)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Open(name string) (afero.File, error) {
|
||||
return fs.source.Open(name)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) OpenFile(name string, flag int, perm os.FileMode) (afero.File, error) {
|
||||
return fs.source.OpenFile(name, flag, perm)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Remove(name string) error {
|
||||
return fs.source.Remove(name)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) RemoveAll(path string) error {
|
||||
return fs.source.RemoveAll(path)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Rename(oldname, newname string) error {
|
||||
return fs.source.Rename(oldname, newname)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Stat(name string) (os.FileInfo, error) {
|
||||
return fs.source.Stat(name)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Chmod(name string, mode os.FileMode) error {
|
||||
return fs.source.Chmod(name, mode)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Chtimes(name string, atime time.Time, mtime time.Time) error {
|
||||
return fs.source.Chtimes(name, atime, mtime)
|
||||
}
|
||||
|
||||
func (fs *GcsFs) Chown(name string, uid, gid int) error {
|
||||
return fs.source.Chown(name, uid, gid)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ import (
|
|||
"strings"
|
||||
|
||||
"cloud.google.com/go/storage"
|
||||
"git.internal/re/afero"
|
||||
"github.com/googleapis/google-cloud-go-testing/storage/stiface"
|
||||
"github.com/spf13/afero"
|
||||
"google.golang.org/api/iterator"
|
||||
)
|
||||
|
||||
|
|
@ -166,7 +166,7 @@ func (w *writerMock) Close() error {
|
|||
if w.file == nil {
|
||||
var err error
|
||||
if strings.HasSuffix(w.name, "/") {
|
||||
err = w.fs.Mkdir(w.name, 0o755)
|
||||
err = w.fs.Mkdir(w.name, 0755)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ import (
|
|||
"golang.org/x/oauth2/google"
|
||||
|
||||
"cloud.google.com/go/storage"
|
||||
"git.internal/re/afero"
|
||||
"github.com/googleapis/google-cloud-go-testing/storage/stiface"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -122,7 +122,7 @@ func TestMain(m *testing.M) {
|
|||
gcsAfs = &afero.Afero{Fs: &GcsFs{NewGcsFs(ctx, mockClient)}}
|
||||
|
||||
// Uncomment to use the real, not mocked, client
|
||||
// gcsAfs = &Afero{Fs: &GcsFs{gcsfs.NewGcsFs(ctx, client)}}
|
||||
//gcsAfs = &Afero{Fs: &GcsFs{gcsfs.NewGcsFs(ctx, client)}}
|
||||
|
||||
exitCode = m.Run()
|
||||
}
|
||||
|
|
@ -341,7 +341,7 @@ func TestGcsSeek(t *testing.T) {
|
|||
t.Fatalf("opening %v: %v", name, err)
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
var tests = []struct {
|
||||
offIn int64
|
||||
whence int
|
||||
offOut int64
|
||||
|
|
@ -477,7 +477,7 @@ func TestGcsOpenFile(t *testing.T) {
|
|||
}
|
||||
|
||||
for _, name := range names {
|
||||
file, err := gcsAfs.OpenFile(name, os.O_RDONLY, 0o400)
|
||||
file, err := gcsAfs.OpenFile(name, os.O_RDONLY, 0400)
|
||||
if !f.exists {
|
||||
if (f.name != "" && !errors.Is(err, syscall.ENOENT)) ||
|
||||
(f.name == "" && !errors.Is(err, ErrNoBucketInName)) {
|
||||
|
|
@ -496,7 +496,7 @@ func TestGcsOpenFile(t *testing.T) {
|
|||
t.Fatalf("failed to close a file \"%s\": %s", name, err)
|
||||
}
|
||||
|
||||
_, err = gcsAfs.OpenFile(name, os.O_CREATE, 0o600)
|
||||
file, err = gcsAfs.OpenFile(name, os.O_CREATE, 0600)
|
||||
if !errors.Is(err, syscall.EPERM) {
|
||||
t.Errorf("%v: open for write: got %v, expected %v", name, err, syscall.EPERM)
|
||||
}
|
||||
|
|
@ -714,7 +714,7 @@ func TestGcsMkdir(t *testing.T) {
|
|||
t.Run("empty", func(t *testing.T) {
|
||||
emptyDirName := bucketName
|
||||
|
||||
err := gcsAfs.Mkdir(emptyDirName, 0o755)
|
||||
err := gcsAfs.Mkdir(emptyDirName, 0755)
|
||||
if err == nil {
|
||||
t.Fatal("did not fail upon creation of an empty folder")
|
||||
}
|
||||
|
|
@ -723,7 +723,7 @@ func TestGcsMkdir(t *testing.T) {
|
|||
dirName := filepath.Join(bucketName, "a-test-dir")
|
||||
var err error
|
||||
|
||||
err = gcsAfs.Mkdir(dirName, 0o755)
|
||||
err = gcsAfs.Mkdir(dirName, 0755)
|
||||
if err != nil {
|
||||
t.Fatal("failed to create a folder with error", err)
|
||||
}
|
||||
|
|
@ -739,7 +739,7 @@ func TestGcsMkdir(t *testing.T) {
|
|||
t.Errorf("%s: mode is not directory", dirName)
|
||||
}
|
||||
|
||||
if info.Mode() != os.ModeDir|0o755 {
|
||||
if info.Mode() != os.ModeDir|0755 {
|
||||
t.Errorf("%s: wrong permissions, expected drwxr-xr-x, got %s", dirName, info.Mode())
|
||||
}
|
||||
|
||||
|
|
@ -754,7 +754,7 @@ func TestGcsMkdirAll(t *testing.T) {
|
|||
t.Run("empty", func(t *testing.T) {
|
||||
emptyDirName := bucketName
|
||||
|
||||
err := gcsAfs.MkdirAll(emptyDirName, 0o755)
|
||||
err := gcsAfs.MkdirAll(emptyDirName, 0755)
|
||||
if err == nil {
|
||||
t.Fatal("did not fail upon creation of an empty folder")
|
||||
}
|
||||
|
|
@ -762,7 +762,7 @@ func TestGcsMkdirAll(t *testing.T) {
|
|||
t.Run("success", func(t *testing.T) {
|
||||
dirName := filepath.Join(bucketName, "a/b/c")
|
||||
|
||||
err := gcsAfs.MkdirAll(dirName, 0o755)
|
||||
err := gcsAfs.MkdirAll(dirName, 0755)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
@ -774,7 +774,7 @@ func TestGcsMkdirAll(t *testing.T) {
|
|||
if !info.Mode().IsDir() {
|
||||
t.Errorf("%s: mode is not directory", filepath.Join(bucketName, "a"))
|
||||
}
|
||||
if info.Mode() != os.ModeDir|0o755 {
|
||||
if info.Mode() != os.ModeDir|0755 {
|
||||
t.Errorf("%s: wrong permissions, expected drwxr-xr-x, got %s", filepath.Join(bucketName, "a"), info.Mode())
|
||||
}
|
||||
info, err = gcsAfs.Stat(filepath.Join(bucketName, "a/b"))
|
||||
|
|
@ -784,7 +784,7 @@ func TestGcsMkdirAll(t *testing.T) {
|
|||
if !info.Mode().IsDir() {
|
||||
t.Errorf("%s: mode is not directory", filepath.Join(bucketName, "a/b"))
|
||||
}
|
||||
if info.Mode() != os.ModeDir|0o755 {
|
||||
if info.Mode() != os.ModeDir|0755 {
|
||||
t.Errorf("%s: wrong permissions, expected drwxr-xr-x, got %s", filepath.Join(bucketName, "a/b"), info.Mode())
|
||||
}
|
||||
info, err = gcsAfs.Stat(dirName)
|
||||
|
|
@ -794,7 +794,7 @@ func TestGcsMkdirAll(t *testing.T) {
|
|||
if !info.Mode().IsDir() {
|
||||
t.Errorf("%s: mode is not directory", dirName)
|
||||
}
|
||||
if info.Mode() != os.ModeDir|0o755 {
|
||||
if info.Mode() != os.ModeDir|0755 {
|
||||
t.Errorf("%s: wrong permissions, expected drwxr-xr-x, got %s", dirName, info.Mode())
|
||||
}
|
||||
|
||||
|
|
@ -816,7 +816,7 @@ func TestGcsRemoveAll(t *testing.T) {
|
|||
aDir := filepath.Join(bucketName, "a")
|
||||
bDir := filepath.Join(aDir, "b")
|
||||
|
||||
err := gcsAfs.MkdirAll(bDir, 0o755)
|
||||
err := gcsAfs.MkdirAll(bDir, 0755)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
|
|
|||
2
go.mod
2
go.mod
|
|
@ -1,4 +1,4 @@
|
|||
module git.internal/re/afero
|
||||
module github.com/spf13/afero
|
||||
|
||||
require (
|
||||
cloud.google.com/go/storage v1.14.0
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ type httpDir struct {
|
|||
}
|
||||
|
||||
func (d httpDir) Open(name string) (http.File, error) {
|
||||
if filepath.Separator != '/' && strings.ContainsRune(name, filepath.Separator) ||
|
||||
if filepath.Separator != '/' && strings.IndexRune(name, filepath.Separator) >= 0 ||
|
||||
strings.Contains(name, "\x00") {
|
||||
return nil, errors.New("http: invalid character in file path")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +0,0 @@
|
|||
// Copyright © 2022 Steve Francia <spf@spf13.com>.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package common
|
||||
|
||||
import "io/fs"
|
||||
|
||||
// FileInfoDirEntry provides an adapter from os.FileInfo to fs.DirEntry
|
||||
type FileInfoDirEntry struct {
|
||||
fs.FileInfo
|
||||
}
|
||||
|
||||
var _ fs.DirEntry = FileInfoDirEntry{}
|
||||
|
||||
func (d FileInfoDirEntry) Type() fs.FileMode { return d.FileInfo.Mode().Type() }
|
||||
|
||||
func (d FileInfoDirEntry) Info() (fs.FileInfo, error) { return d.FileInfo, nil }
|
||||
38
iofs.go
38
iofs.go
|
|
@ -1,4 +1,3 @@
|
|||
//go:build go1.16
|
||||
// +build go1.16
|
||||
|
||||
package afero
|
||||
|
|
@ -8,10 +7,7 @@ import (
|
|||
"io/fs"
|
||||
"os"
|
||||
"path"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"git.internal/re/afero/internal/common"
|
||||
)
|
||||
|
||||
// IOFS adopts afero.Fs to stdlib io/fs.FS
|
||||
|
|
@ -70,31 +66,14 @@ func (iofs IOFS) Glob(pattern string) ([]string, error) {
|
|||
}
|
||||
|
||||
func (iofs IOFS) ReadDir(name string) ([]fs.DirEntry, error) {
|
||||
f, err := iofs.Fs.Open(name)
|
||||
items, err := ReadDir(iofs.Fs, name)
|
||||
if err != nil {
|
||||
return nil, iofs.wrapError("readdir", name, err)
|
||||
}
|
||||
|
||||
defer f.Close()
|
||||
|
||||
if rdf, ok := f.(fs.ReadDirFile); ok {
|
||||
items, err := rdf.ReadDir(-1)
|
||||
if err != nil {
|
||||
return nil, iofs.wrapError("readdir", name, err)
|
||||
}
|
||||
sort.Slice(items, func(i, j int) bool { return items[i].Name() < items[j].Name() })
|
||||
return items, nil
|
||||
}
|
||||
|
||||
items, err := f.Readdir(-1)
|
||||
if err != nil {
|
||||
return nil, iofs.wrapError("readdir", name, err)
|
||||
}
|
||||
sort.Sort(byName(items))
|
||||
|
||||
ret := make([]fs.DirEntry, len(items))
|
||||
for i := range items {
|
||||
ret[i] = common.FileInfoDirEntry{FileInfo: items[i]}
|
||||
ret[i] = dirEntry{items[i]}
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
|
|
@ -129,6 +108,17 @@ func (IOFS) wrapError(op, path string, err error) error {
|
|||
}
|
||||
}
|
||||
|
||||
// dirEntry provides adapter from os.FileInfo to fs.DirEntry
|
||||
type dirEntry struct {
|
||||
fs.FileInfo
|
||||
}
|
||||
|
||||
var _ fs.DirEntry = dirEntry{}
|
||||
|
||||
func (d dirEntry) Type() fs.FileMode { return d.FileInfo.Mode().Type() }
|
||||
|
||||
func (d dirEntry) Info() (fs.FileInfo, error) { return d.FileInfo, nil }
|
||||
|
||||
// readDirFile provides adapter from afero.File to fs.ReadDirFile needed for correct Open
|
||||
type readDirFile struct {
|
||||
File
|
||||
|
|
@ -144,7 +134,7 @@ func (r readDirFile) ReadDir(n int) ([]fs.DirEntry, error) {
|
|||
|
||||
ret := make([]fs.DirEntry, len(items))
|
||||
for i := range items {
|
||||
ret[i] = common.FileInfoDirEntry{FileInfo: items[i]}
|
||||
ret[i] = dirEntry{items[i]}
|
||||
}
|
||||
|
||||
return ret, nil
|
||||
|
|
|
|||
145
iofs_test.go
145
iofs_test.go
|
|
@ -1,4 +1,3 @@
|
|||
//go:build go1.16
|
||||
// +build go1.16
|
||||
|
||||
package afero
|
||||
|
|
@ -6,25 +5,15 @@ package afero
|
|||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"math/rand"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"testing"
|
||||
"testing/fstest"
|
||||
"time"
|
||||
|
||||
"git.internal/re/afero/internal/common"
|
||||
)
|
||||
|
||||
func TestIOFS(t *testing.T) {
|
||||
if runtime.GOOS == "windows" {
|
||||
// TODO(bep): some of the "bad path" tests in fstest.TestFS fail on Windows
|
||||
t.Skip("Skipping on Windows")
|
||||
}
|
||||
t.Parallel()
|
||||
|
||||
t.Run("use MemMapFs", func(t *testing.T) {
|
||||
|
|
@ -68,93 +57,6 @@ func TestIOFS(t *testing.T) {
|
|||
})
|
||||
}
|
||||
|
||||
func TestIOFSNativeDirEntryWhenPossible(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
osfs := NewBasePathFs(NewOsFs(), t.TempDir())
|
||||
|
||||
err := osfs.MkdirAll("dir1/dir2", os.ModePerm)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
const numFiles = 10
|
||||
|
||||
var fileNumbers []int
|
||||
for i := 0; i < numFiles; i++ {
|
||||
fileNumbers = append(fileNumbers, i)
|
||||
}
|
||||
rand.Shuffle(len(fileNumbers), func(i, j int) {
|
||||
fileNumbers[i], fileNumbers[j] = fileNumbers[j], fileNumbers[i]
|
||||
})
|
||||
|
||||
for _, i := range fileNumbers {
|
||||
f, err := osfs.Create(fmt.Sprintf("dir1/dir2/test%d.txt", i))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
f.Close()
|
||||
}
|
||||
|
||||
dir2, err := osfs.Open("dir1/dir2")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assertDirEntries := func(entries []fs.DirEntry, ordered bool) {
|
||||
if len(entries) != numFiles {
|
||||
t.Fatalf("expected %d, got %d", numFiles, len(entries))
|
||||
}
|
||||
for i, entry := range entries {
|
||||
if _, ok := entry.(common.FileInfoDirEntry); ok {
|
||||
t.Fatal("DirEntry not native")
|
||||
}
|
||||
if ordered && entry.Name() != fmt.Sprintf("test%d.txt", i) {
|
||||
t.Fatalf("expected %s, got %s", fmt.Sprintf("test%d.txt", i), entry.Name())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dirEntries, err := dir2.(fs.ReadDirFile).ReadDir(-1)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assertDirEntries(dirEntries, false)
|
||||
|
||||
iofs := NewIOFS(osfs)
|
||||
|
||||
dirEntries, err = iofs.ReadDir("dir1/dir2")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assertDirEntries(dirEntries, true)
|
||||
|
||||
fileCount := 0
|
||||
err = fs.WalkDir(iofs, "", func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !d.IsDir() {
|
||||
fileCount++
|
||||
}
|
||||
|
||||
if _, ok := d.(common.FileInfoDirEntry); ok {
|
||||
t.Fatal("DirEntry not native")
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if fileCount != numFiles {
|
||||
t.Fatalf("expected %d, got %d", numFiles, fileCount)
|
||||
}
|
||||
}
|
||||
|
||||
func TestFromIOFS(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
|
|
@ -357,6 +259,7 @@ func TestFromIOFS_File(t *testing.T) {
|
|||
// MapFS files implements io.ReaderAt
|
||||
b := make([]byte, 2)
|
||||
_, err := file.ReadAt(b, 2)
|
||||
|
||||
if err != nil {
|
||||
t.Errorf("ReadAt failed: %v", err)
|
||||
return
|
||||
|
|
@ -416,7 +319,7 @@ func TestFromIOFS_File(t *testing.T) {
|
|||
return
|
||||
}
|
||||
|
||||
expectedItems := []struct {
|
||||
var expectedItems = []struct {
|
||||
Name string
|
||||
IsDir bool
|
||||
Size int64
|
||||
|
|
@ -468,7 +371,7 @@ func TestFromIOFS_File(t *testing.T) {
|
|||
return
|
||||
}
|
||||
|
||||
expectedItems := []string{"dir1", "dir2", "test.txt"}
|
||||
var expectedItems = []string{"dir1", "dir2", "test.txt"}
|
||||
|
||||
if len(expectedItems) != len(items) {
|
||||
t.Errorf("Items count mismatch, expected %d, got %d", len(expectedItems), len(items))
|
||||
|
|
@ -507,45 +410,3 @@ func assertPermissionError(t *testing.T, err error) {
|
|||
t.Errorf("Expected (*fs.PathError).Err == fs.ErrPermisson, got %[1]T (%[1]v)", err)
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkWalkDir(b *testing.B) {
|
||||
osfs := NewBasePathFs(NewOsFs(), b.TempDir())
|
||||
|
||||
createSomeFiles := func(dirname string) {
|
||||
for i := 0; i < 10; i++ {
|
||||
f, err := osfs.Create(filepath.Join(dirname, fmt.Sprintf("test%d.txt", i)))
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
f.Close()
|
||||
}
|
||||
}
|
||||
|
||||
depth := 10
|
||||
for level := depth; level > 0; level-- {
|
||||
dirname := ""
|
||||
for i := 0; i < level; i++ {
|
||||
dirname = filepath.Join(dirname, fmt.Sprintf("dir%d", i))
|
||||
err := osfs.MkdirAll(dirname, 0o755)
|
||||
if err != nil && !os.IsExist(err) {
|
||||
b.Fatal(err)
|
||||
}
|
||||
}
|
||||
createSomeFiles(dirname)
|
||||
}
|
||||
|
||||
iofs := NewIOFS(osfs)
|
||||
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
err := fs.WalkDir(iofs, "", func(path string, d fs.DirEntry, err error) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
b.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
10
ioutil.go
10
ioutil.go
|
|
@ -141,7 +141,7 @@ func WriteFile(fs Fs, filename string, data []byte, perm os.FileMode) error {
|
|||
// We generate random temporary file names so that there's a good
|
||||
// chance the file doesn't exist yet - keeps the number of tries in
|
||||
// TempFile to a minimum.
|
||||
var randNum uint32
|
||||
var rand uint32
|
||||
var randmu sync.Mutex
|
||||
|
||||
func reseed() uint32 {
|
||||
|
|
@ -150,12 +150,12 @@ func reseed() uint32 {
|
|||
|
||||
func nextRandom() string {
|
||||
randmu.Lock()
|
||||
r := randNum
|
||||
r := rand
|
||||
if r == 0 {
|
||||
r = reseed()
|
||||
}
|
||||
r = r*1664525 + 1013904223 // constants from Numerical Recipes
|
||||
randNum = r
|
||||
rand = r
|
||||
randmu.Unlock()
|
||||
return strconv.Itoa(int(1e9 + r%1e9))[1:]
|
||||
}
|
||||
|
|
@ -194,7 +194,7 @@ func TempFile(fs Fs, dir, pattern string) (f File, err error) {
|
|||
if os.IsExist(err) {
|
||||
if nconflict++; nconflict > 10 {
|
||||
randmu.Lock()
|
||||
randNum = reseed()
|
||||
rand = reseed()
|
||||
randmu.Unlock()
|
||||
}
|
||||
continue
|
||||
|
|
@ -226,7 +226,7 @@ func TempDir(fs Fs, dir, prefix string) (name string, err error) {
|
|||
if os.IsExist(err) {
|
||||
if nconflict++; nconflict > 10 {
|
||||
randmu.Lock()
|
||||
randNum = reseed()
|
||||
rand = reseed()
|
||||
randmu.Unlock()
|
||||
}
|
||||
continue
|
||||
|
|
|
|||
|
|
@ -37,13 +37,13 @@ func TestReadFile(t *testing.T) {
|
|||
|
||||
testFS.Create("this_exists.go")
|
||||
filename := "rumpelstilzchen"
|
||||
_, err := fsutil.ReadFile(filename)
|
||||
contents, err := fsutil.ReadFile(filename)
|
||||
if err == nil {
|
||||
t.Fatalf("ReadFile %s: error expected, none found", filename)
|
||||
}
|
||||
|
||||
filename = "this_exists.go"
|
||||
contents, err := fsutil.ReadFile(filename)
|
||||
contents, err = fsutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
t.Fatalf("ReadFile %s: %v", filename, err)
|
||||
}
|
||||
|
|
|
|||
37
mem/file.go
37
mem/file.go
|
|
@ -18,20 +18,15 @@ import (
|
|||
"bytes"
|
||||
"errors"
|
||||
"io"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
"git.internal/re/afero/internal/common"
|
||||
)
|
||||
|
||||
const FilePathSeparator = string(filepath.Separator)
|
||||
|
||||
var _ fs.ReadDirFile = &File{}
|
||||
|
||||
type File struct {
|
||||
// atomic requires 64-bit alignment for struct field access
|
||||
at int64
|
||||
|
|
@ -188,23 +183,10 @@ func (f *File) Readdirnames(n int) (names []string, err error) {
|
|||
return names, err
|
||||
}
|
||||
|
||||
// Implements fs.ReadDirFile
|
||||
func (f *File) ReadDir(n int) ([]fs.DirEntry, error) {
|
||||
fi, err := f.Readdir(n)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
di := make([]fs.DirEntry, len(fi))
|
||||
for i, f := range fi {
|
||||
di[i] = common.FileInfoDirEntry{FileInfo: f}
|
||||
}
|
||||
return di, nil
|
||||
}
|
||||
|
||||
func (f *File) Read(b []byte) (n int, err error) {
|
||||
f.fileData.Lock()
|
||||
defer f.fileData.Unlock()
|
||||
if f.closed {
|
||||
if f.closed == true {
|
||||
return 0, ErrFileClosed
|
||||
}
|
||||
if len(b) > 0 && int(f.at) == len(f.fileData.data) {
|
||||
|
|
@ -232,7 +214,7 @@ func (f *File) ReadAt(b []byte, off int64) (n int, err error) {
|
|||
}
|
||||
|
||||
func (f *File) Truncate(size int64) error {
|
||||
if f.closed {
|
||||
if f.closed == true {
|
||||
return ErrFileClosed
|
||||
}
|
||||
if f.readOnly {
|
||||
|
|
@ -245,7 +227,7 @@ func (f *File) Truncate(size int64) error {
|
|||
defer f.fileData.Unlock()
|
||||
if size > int64(len(f.fileData.data)) {
|
||||
diff := size - int64(len(f.fileData.data))
|
||||
f.fileData.data = append(f.fileData.data, bytes.Repeat([]byte{0o0}, int(diff))...)
|
||||
f.fileData.data = append(f.fileData.data, bytes.Repeat([]byte{00}, int(diff))...)
|
||||
} else {
|
||||
f.fileData.data = f.fileData.data[0:size]
|
||||
}
|
||||
|
|
@ -254,7 +236,7 @@ func (f *File) Truncate(size int64) error {
|
|||
}
|
||||
|
||||
func (f *File) Seek(offset int64, whence int) (int64, error) {
|
||||
if f.closed {
|
||||
if f.closed == true {
|
||||
return 0, ErrFileClosed
|
||||
}
|
||||
switch whence {
|
||||
|
|
@ -269,7 +251,7 @@ func (f *File) Seek(offset int64, whence int) (int64, error) {
|
|||
}
|
||||
|
||||
func (f *File) Write(b []byte) (n int, err error) {
|
||||
if f.closed {
|
||||
if f.closed == true {
|
||||
return 0, ErrFileClosed
|
||||
}
|
||||
if f.readOnly {
|
||||
|
|
@ -285,7 +267,7 @@ func (f *File) Write(b []byte) (n int, err error) {
|
|||
tail = f.fileData.data[n+int(cur):]
|
||||
}
|
||||
if diff > 0 {
|
||||
f.fileData.data = append(f.fileData.data, append(bytes.Repeat([]byte{0o0}, int(diff)), b...)...)
|
||||
f.fileData.data = append(f.fileData.data, append(bytes.Repeat([]byte{00}, int(diff)), b...)...)
|
||||
f.fileData.data = append(f.fileData.data, tail...)
|
||||
} else {
|
||||
f.fileData.data = append(f.fileData.data[:cur], b...)
|
||||
|
|
@ -321,19 +303,16 @@ func (s *FileInfo) Name() string {
|
|||
s.Unlock()
|
||||
return name
|
||||
}
|
||||
|
||||
func (s *FileInfo) Mode() os.FileMode {
|
||||
s.Lock()
|
||||
defer s.Unlock()
|
||||
return s.mode
|
||||
}
|
||||
|
||||
func (s *FileInfo) ModTime() time.Time {
|
||||
s.Lock()
|
||||
defer s.Unlock()
|
||||
return s.modtime
|
||||
}
|
||||
|
||||
func (s *FileInfo) IsDir() bool {
|
||||
s.Lock()
|
||||
defer s.Unlock()
|
||||
|
|
@ -351,8 +330,8 @@ func (s *FileInfo) Size() int64 {
|
|||
|
||||
var (
|
||||
ErrFileClosed = errors.New("File is closed")
|
||||
ErrOutOfRange = errors.New("out of range")
|
||||
ErrTooLarge = errors.New("too large")
|
||||
ErrOutOfRange = errors.New("Out of range")
|
||||
ErrTooLarge = errors.New("Too large")
|
||||
ErrFileNotFound = os.ErrNotExist
|
||||
ErrFileExists = os.ErrExist
|
||||
ErrDestinationExists = os.ErrExist
|
||||
|
|
|
|||
|
|
@ -66,8 +66,8 @@ func TestFileDataModTimeRace(t *testing.T) {
|
|||
|
||||
func TestFileDataModeRace(t *testing.T) {
|
||||
t.Parallel()
|
||||
const someMode = 0o777
|
||||
const someOtherMode = 0o660
|
||||
const someMode = 0777
|
||||
const someOtherMode = 0660
|
||||
|
||||
d := FileData{
|
||||
mode: someMode,
|
||||
|
|
@ -95,7 +95,7 @@ func TestFileDataModeRace(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
// See https://git.internal/re/afero/issues/286.
|
||||
// See https://github.com/spf13/afero/issues/286.
|
||||
func TestFileWriteAt(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ func TestFileDataIsDirRace(t *testing.T) {
|
|||
s.Unlock()
|
||||
}()
|
||||
|
||||
// just logging the value to trigger a read:
|
||||
//just logging the value to trigger a read:
|
||||
t.Logf("Value is %v", s.IsDir())
|
||||
}
|
||||
|
||||
|
|
@ -196,10 +196,10 @@ func TestFileDataSizeRace(t *testing.T) {
|
|||
s.Unlock()
|
||||
}()
|
||||
|
||||
// just logging the value to trigger a read:
|
||||
//just logging the value to trigger a read:
|
||||
t.Logf("Value is %v", s.Size())
|
||||
|
||||
// Testing the Dir size case
|
||||
//Testing the Dir size case
|
||||
d.dir = true
|
||||
if s.Size() != int64(42) {
|
||||
t.Errorf("Failed to read correct value for dir, was %v", s.Size())
|
||||
|
|
|
|||
13
memmap.go
13
memmap.go
|
|
@ -22,7 +22,7 @@ import (
|
|||
"sync"
|
||||
"time"
|
||||
|
||||
"git.internal/re/afero/mem"
|
||||
"github.com/spf13/afero/mem"
|
||||
)
|
||||
|
||||
const chmodBits = os.ModePerm | os.ModeSetuid | os.ModeSetgid | os.ModeSticky // Only a subset of bits are allowed to be changed. Documented under os.Chmod()
|
||||
|
|
@ -43,7 +43,7 @@ func (m *MemMapFs) getData() map[string]*mem.FileData {
|
|||
// Root should always exist, right?
|
||||
// TODO: what about windows?
|
||||
root := mem.CreateDir(FilePathSeparator)
|
||||
mem.SetMode(root, os.ModeDir|0o755)
|
||||
mem.SetMode(root, os.ModeDir|0755)
|
||||
m.data[FilePathSeparator] = root
|
||||
})
|
||||
return m.data
|
||||
|
|
@ -96,12 +96,12 @@ func (m *MemMapFs) registerWithParent(f *mem.FileData, perm os.FileMode) {
|
|||
pdir := filepath.Dir(filepath.Clean(f.Name()))
|
||||
err := m.lockfreeMkdir(pdir, perm)
|
||||
if err != nil {
|
||||
// log.Println("Mkdir error:", err)
|
||||
//log.Println("Mkdir error:", err)
|
||||
return
|
||||
}
|
||||
parent, err = m.lockfreeOpen(pdir)
|
||||
if err != nil {
|
||||
// log.Println("Open after Mkdir error:", err)
|
||||
//log.Println("Open after Mkdir error:", err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
|
@ -142,11 +142,6 @@ func (m *MemMapFs) Mkdir(name string, perm os.FileMode) error {
|
|||
}
|
||||
|
||||
m.mu.Lock()
|
||||
// Dobule check that it doesn't exist.
|
||||
if _, ok := m.getData()[name]; ok {
|
||||
m.mu.Unlock()
|
||||
return &os.PathError{Op: "mkdir", Path: name, Err: ErrFileExists}
|
||||
}
|
||||
item := mem.CreateDir(name)
|
||||
mem.SetMode(item, os.ModeDir|perm)
|
||||
m.getData()[name] = item
|
||||
|
|
|
|||
|
|
@ -3,12 +3,9 @@ package afero
|
|||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
|
@ -217,7 +214,7 @@ func TestMultipleOpenFiles(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Error("fh.Write failed: " + err.Error())
|
||||
}
|
||||
_, err = fh1.Seek(0, io.SeekStart)
|
||||
_, err = fh1.Seek(0, os.SEEK_SET)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
|
@ -695,84 +692,3 @@ func TestMemFsLstatIfPossible(t *testing.T) {
|
|||
t.Fatalf("Function indicated lstat was called. This should never be true.")
|
||||
}
|
||||
}
|
||||
|
||||
func TestMemMapFsConfurrentMkdir(t *testing.T) {
|
||||
const dir = "test_dir"
|
||||
const n = 1000
|
||||
mfs := NewMemMapFs().(*MemMapFs)
|
||||
|
||||
allFilePaths := make([]string, 0, n)
|
||||
|
||||
// run concurrency test
|
||||
var wg sync.WaitGroup
|
||||
for i := 0; i < n; i++ {
|
||||
fp := filepath.Join(
|
||||
dir,
|
||||
fmt.Sprintf("%02d", n%10),
|
||||
fmt.Sprintf("%d.txt", i),
|
||||
)
|
||||
allFilePaths = append(allFilePaths, fp)
|
||||
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
|
||||
if err := mfs.MkdirAll(filepath.Dir(fp), 0755); err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
wt, err := mfs.Create(fp)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
defer func() {
|
||||
if err := wt.Close(); err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
}()
|
||||
|
||||
// write 30 bytes
|
||||
for j := 0; j < 10; j++ {
|
||||
_, err := wt.Write([]byte("000"))
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
||||
}()
|
||||
}
|
||||
wg.Wait()
|
||||
|
||||
// Test1: find all files by full path access
|
||||
for _, fp := range allFilePaths {
|
||||
info, err := mfs.Stat(fp)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
|
||||
if info.Size() != 30 {
|
||||
t.Errorf("file size should be 30, but got %d", info.Size())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Test2: find all files by walk
|
||||
foundFiles := make([]string, 0, n)
|
||||
wErr := Walk(mfs, dir, func(path string, info fs.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
if info.IsDir() {
|
||||
return nil // skip dir
|
||||
}
|
||||
if strings.HasSuffix(info.Name(), ".txt") {
|
||||
foundFiles = append(foundFiles, path)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if wErr != nil {
|
||||
t.Error(wErr)
|
||||
}
|
||||
if len(foundFiles) != n {
|
||||
t.Errorf("found %d files, but expect %d", len(foundFiles), n)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ func TestFilterReadOnly(t *testing.T) {
|
|||
|
||||
func TestFilterReadonlyRemoveAndRead(t *testing.T) {
|
||||
mfs := &MemMapFs{}
|
||||
fh, _ := mfs.Create("/file.txt")
|
||||
fh, err := mfs.Create("/file.txt")
|
||||
fh.Write([]byte("content here"))
|
||||
fh.Close()
|
||||
|
||||
fs := NewReadOnlyFs(mfs)
|
||||
err := fs.Remove("/file.txt")
|
||||
err = fs.Remove("/file.txt")
|
||||
if err == nil {
|
||||
t.Errorf("Did not fail to remove file")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@ import (
|
|||
"os"
|
||||
"time"
|
||||
|
||||
"git.internal/re/afero"
|
||||
"github.com/pkg/sftp"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
// Fs is a afero.Fs implementation that uses functions provided by the sftp package.
|
||||
|
|
|
|||
|
|
@ -215,9 +215,6 @@ func MakeSSHKeyPair(bits int, pubKeyPath, privateKeyPath string) error {
|
|||
|
||||
// generate and write private key as PEM
|
||||
privateKeyFile, err := os.Create(privateKeyPath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer privateKeyFile.Close()
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
"sort"
|
||||
"syscall"
|
||||
|
||||
"git.internal/re/afero"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
type File struct {
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"git.internal/re/afero"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
type Fs struct {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import (
|
|||
"syscall"
|
||||
"testing"
|
||||
|
||||
"git.internal/re/afero"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
var files = []struct {
|
||||
|
|
@ -161,7 +161,7 @@ func TestSeek(t *testing.T) {
|
|||
t.Fatalf("opening %v: %v", f.name, err)
|
||||
}
|
||||
|
||||
tests := []struct {
|
||||
var tests = []struct {
|
||||
offin int64
|
||||
whence int
|
||||
offout int64
|
||||
|
|
@ -252,7 +252,7 @@ func TestClose(t *testing.T) {
|
|||
|
||||
func TestOpenFile(t *testing.T) {
|
||||
for _, f := range files {
|
||||
file, err := afs.OpenFile(f.name, os.O_RDONLY, 0o400)
|
||||
file, err := afs.OpenFile(f.name, os.O_RDONLY, 0400)
|
||||
if !f.exists {
|
||||
if !errors.Is(err, syscall.ENOENT) {
|
||||
t.Errorf("%v: got %v, expected%v", f.name, err, syscall.ENOENT)
|
||||
|
|
@ -266,7 +266,7 @@ func TestOpenFile(t *testing.T) {
|
|||
}
|
||||
file.Close()
|
||||
|
||||
_, err = afs.OpenFile(f.name, os.O_CREATE, 0o600)
|
||||
file, err = afs.OpenFile(f.name, os.O_CREATE, 0600)
|
||||
if !errors.Is(err, syscall.EPERM) {
|
||||
t.Errorf("%v: open for write: got %v, expected %v", f.name, err, syscall.EPERM)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ func (f *UnionFile) ReadAt(s []byte, o int64) (int, error) {
|
|||
if f.Layer != nil {
|
||||
n, err := f.Layer.ReadAt(s, o)
|
||||
if (err == nil || err == io.EOF) && f.Base != nil {
|
||||
_, err = f.Base.Seek(o+int64(n), io.SeekStart)
|
||||
_, err = f.Base.Seek(o+int64(n), os.SEEK_SET)
|
||||
}
|
||||
return n, err
|
||||
}
|
||||
|
|
|
|||
10
util.go
10
util.go
|
|
@ -25,7 +25,6 @@ import (
|
|||
"strings"
|
||||
"unicode"
|
||||
|
||||
"golang.org/x/text/runes"
|
||||
"golang.org/x/text/transform"
|
||||
"golang.org/x/text/unicode/norm"
|
||||
)
|
||||
|
|
@ -159,12 +158,16 @@ func UnicodeSanitize(s string) string {
|
|||
|
||||
// Transform characters with accents into plain forms.
|
||||
func NeuterAccents(s string) string {
|
||||
t := transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
|
||||
t := transform.Chain(norm.NFD, transform.RemoveFunc(isMn), norm.NFC)
|
||||
result, _, _ := transform.String(t, string(s))
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
func isMn(r rune) bool {
|
||||
return unicode.Is(unicode.Mn, r) // Mn: nonspacing marks
|
||||
}
|
||||
|
||||
func (a Afero) FileContainsBytes(filename string, subslice []byte) (bool, error) {
|
||||
return FileContainsBytes(a.Fs, filename, subslice)
|
||||
}
|
||||
|
|
@ -296,9 +299,6 @@ func IsEmpty(fs Fs, path string) (bool, error) {
|
|||
}
|
||||
defer f.Close()
|
||||
list, err := f.Readdir(-1)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return len(list) == 0, nil
|
||||
}
|
||||
return fi.Size() == 0, nil
|
||||
|
|
|
|||
10
util_test.go
10
util_test.go
|
|
@ -185,7 +185,7 @@ func createZeroSizedFileInTempDir() (File, error) {
|
|||
func createNonZeroSizedFileInTempDir() (File, error) {
|
||||
f, err := createZeroSizedFileInTempDir()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
// no file ??
|
||||
}
|
||||
byteString := []byte("byteString")
|
||||
err = WriteFile(testFS, f.Name(), byteString, 0644)
|
||||
|
|
@ -200,7 +200,7 @@ func createNonZeroSizedFileInTempDir() (File, error) {
|
|||
func deleteFileInTempDir(f File) {
|
||||
err := testFS.Remove(f.Name())
|
||||
if err != nil {
|
||||
panic(err)
|
||||
// now what?
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -217,7 +217,7 @@ func createEmptyTempDir() (string, error) {
|
|||
func createTempDirWithZeroLengthFiles() (string, error) {
|
||||
d, dirErr := createEmptyTempDir()
|
||||
if dirErr != nil {
|
||||
return "", dirErr
|
||||
//now what?
|
||||
}
|
||||
filePrefix := "_path_test_"
|
||||
_, fileErr := TempFile(testFS, d, filePrefix) // dir is os.TempDir()
|
||||
|
|
@ -235,7 +235,7 @@ func createTempDirWithZeroLengthFiles() (string, error) {
|
|||
func createTempDirWithNonZeroLengthFiles() (string, error) {
|
||||
d, dirErr := createEmptyTempDir()
|
||||
if dirErr != nil {
|
||||
return "", dirErr
|
||||
//now what?
|
||||
}
|
||||
filePrefix := "_path_test_"
|
||||
f, fileErr := TempFile(testFS, d, filePrefix) // dir is os.TempDir()
|
||||
|
|
@ -406,7 +406,7 @@ func TestGetTempDir(t *testing.T) {
|
|||
func deleteTempDir(d string) {
|
||||
err := os.RemoveAll(d)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
// now what?
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"path/filepath"
|
||||
"syscall"
|
||||
|
||||
"git.internal/re/afero"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
type File struct {
|
||||
|
|
@ -85,10 +85,10 @@ func (f *File) Seek(offset int64, whence int) (int64, error) {
|
|||
return 0, afero.ErrFileClosed
|
||||
}
|
||||
switch whence {
|
||||
case io.SeekStart:
|
||||
case io.SeekCurrent:
|
||||
case os.SEEK_SET:
|
||||
case os.SEEK_CUR:
|
||||
offset += f.offset
|
||||
case io.SeekEnd:
|
||||
case os.SEEK_END:
|
||||
offset += int64(f.zipfile.UncompressedSize64)
|
||||
default:
|
||||
return 0, syscall.EINVAL
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"git.internal/re/afero"
|
||||
"github.com/spf13/afero"
|
||||
)
|
||||
|
||||
type Fs struct {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
package zipfs
|
||||
|
||||
import (
|
||||
"github.com/spf13/afero"
|
||||
|
||||
"archive/zip"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"git.internal/re/afero"
|
||||
)
|
||||
|
||||
func TestZipFS(t *testing.T) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue