mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Add support for broken and non-broken symlinks to readdir

Browse Source
This commit is contained in:
Felicitas Pojtinger
2022-01-25 00:28:04 +01:00
parent c4ba80416a
commit 23e06c62aa
3 changed files with 141 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

287
pkg/fs/file_test.go
View File

@@ -732,9 +732,8 @@ var readdirTests = []struct {
} }
for _, info := range f { for _, info := range f {
name, ok := wantNames[info.Name()] if _, ok := wantNames[info.Name()]; !ok {
if !ok { return fmt.Errorf("could not find file or directory with name %v", info.Name())
return fmt.Errorf("could not find file or directory with name %v", name)
} }
} }
@@ -777,9 +776,8 @@ var readdirTests = []struct {
} }
for _, info := range f { for _, info := range f {
name, ok := wantNames[info.Name()] if _, ok := wantNames[info.Name()]; !ok {
if !ok { return fmt.Errorf("could not find file or directory with name %v", info.Name())
return fmt.Errorf("could not find file or directory with name %v", name)
} }
} }
@@ -822,9 +820,8 @@ var readdirTests = []struct {
} }
for _, info := range f { for _, info := range f {
name, ok := wantNames[info.Name()] if _, ok := wantNames[info.Name()]; !ok {
if !ok { return fmt.Errorf("could not find file or directory with name %v", info.Name())
return fmt.Errorf("could not find file or directory with name %v", name)
} }
} }
@@ -870,9 +867,8 @@ var readdirTests = []struct {
} }
for _, info := range f { for _, info := range f {
name, ok := wantNames[info.Name()] if _, ok := wantNames[info.Name()]; !ok {
if !ok { return fmt.Errorf("could not find file or directory with name %v", info.Name())
return fmt.Errorf("could not find file or directory with name %v", name)
} }
} }
@@ -923,9 +919,8 @@ var readdirTests = []struct {
} }
for _, info := range f { for _, info := range f {
name, ok := wantNames[info.Name()] if _, ok := wantNames[info.Name()]; !ok {
if !ok { return fmt.Errorf("could not find file or directory with name %v", info.Name())
return fmt.Errorf("could not find file or directory with name %v", name)
} }
} }
@@ -940,186 +935,126 @@ var readdirTests = []struct {
true, true,
true, true,
}, },
// { {
// "Can readdir 5 in /mydir/nested if there are multiple children and non-broken symlinks", "Can readdir 5 in /mydir/nested if there are multiple children and non-broken symlinks",
// "/mydir/nested", "/mydir/nested",
// readdirArgs{5}, readdirArgs{5},
// false, false,
// func(f symFs) error { func(f symFs) error {
// if _, err := f.Create("/test.txt"); err != nil { if _, err := f.Create("/test.txt"); err != nil {
// return err return err
// } }
// if err := f.MkdirAll("/mydir/nested", os.ModePerm); err != nil { if err := f.MkdirAll("/mydir/nested", os.ModePerm); err != nil {
// return err return err
// } }
// if _, err := f.Create("/mydir/nested/asdf.txt"); err != nil { if _, err := f.Create("/mydir/nested/asdf.txt"); err != nil {
// return err return err
// } }
// if _, err := f.Create("/mydir/nested/hmm.txt"); err != nil { if _, err := f.Create("/mydir/nested/hmm.txt"); err != nil {
// return err return err
// } }
// if _, err := f.Create("/mydir/nested/hmm2.txt"); err != nil { if _, err := f.Create("/mydir/nested/hmm2.txt"); err != nil {
// return err return err
// } }
// if err := f.SymlinkIfPossible("/test.txt", "/mydir/nested/existingsymlink"); err != nil { if err := f.SymlinkIfPossible("/test.txt", "/mydir/nested/existingsymlink"); err != nil {
// return nil return nil
// } }
// if err := f.SymlinkIfPossible("/mydir/nested/hmm.txt", "/mydir/nested/existingsymlink2"); err != nil { if err := f.SymlinkIfPossible("/mydir/nested/hmm.txt", "/mydir/nested/existingsymlink2"); err != nil {
// return nil return nil
// } }
// return nil return nil
// }, },
// func(f []os.FileInfo) error { func(f []os.FileInfo) error {
// wantNames := map[string]struct{}{ wantNames := map[string]struct{}{
// "asdf.txt": {}, "asdf.txt": {},
// "hmm.txt": {}, "hmm.txt": {},
// "hmm2.txt": {}, "hmm2.txt": {},
// "existingsymlink": {}, "existingsymlink": {},
// "existingsymlink2": {}, "existingsymlink2": {},
// } }
// for _, info := range f { for _, info := range f {
// name, ok := wantNames[info.Name()] if _, ok := wantNames[info.Name()]; !ok {
// if !ok { return fmt.Errorf("could not find file or directory with name %v", info.Name())
// return fmt.Errorf("could not find file or directory with name %v", name) }
// } }
// }
// wantLength := len(wantNames) wantLength := len(wantNames)
// gotLength := len(f) gotLength := len(f)
// if wantLength != gotLength { if wantLength != gotLength {
// return fmt.Errorf("invalid amount of children, got %v, want %v", gotLength, wantLength) return fmt.Errorf("invalid amount of children, got %v, want %v", gotLength, wantLength)
// } }
// return nil return nil
// }, },
// true, true,
// true, true,
// }, },
// { {
// "Can readdir 5 in /mydir/nested if there are multiple children and broken symlinks", "Can readdir 5 in /mydir/nested if there are multiple children and broken symlinks",
// "/mydir/nested", "/mydir/nested",
// readdirArgs{5}, readdirArgs{5},
// false, false,
// func(f symFs) error { func(f symFs) error {
// if err := f.MkdirAll("/mydir/nested", os.ModePerm); err != nil { if err := f.MkdirAll("/mydir/nested", os.ModePerm); err != nil {
// return err return err
// } }
// if _, err := f.Create("/mydir/nested/asdf.txt"); err != nil { if _, err := f.Create("/mydir/nested/asdf.txt"); err != nil {
// return err return err
// } }
// if _, err := f.Create("/mydir/nested/hmm.txt"); err != nil { if _, err := f.Create("/mydir/nested/hmm.txt"); err != nil {
// return err return err
// } }
// if _, err := f.Create("/mydir/nested/hmm2.txt"); err != nil { if _, err := f.Create("/mydir/nested/hmm2.txt"); err != nil {
// return err return err
// } }
// if err := f.SymlinkIfPossible("/mydir/nested/hmm2.txt", "/mydir/nested/existingsymlink"); err != nil { if err := f.SymlinkIfPossible("/test.txt", "/mydir/nested/existingsymlink"); err != nil {
// return nil return nil
// } }
// if err := f.SymlinkIfPossible("/test.txt", "/mydir/nested/brokensymlink"); err != nil { if err := f.SymlinkIfPossible("/mydir/nested/hmm.txt", "/mydir/nested/existingsymlink2"); err != nil {
// return nil return nil
// } }
// return nil return nil
// }, },
// func(f []os.FileInfo) error { func(f []os.FileInfo) error {
// wantNames := map[string]struct{}{ wantNames := map[string]struct{}{
// "asdf.txt": {}, "asdf.txt": {},
// "hmm.txt": {}, "hmm.txt": {},
// "hmm2.txt": {}, "hmm2.txt": {},
// "existingsymlink": {}, "existingsymlink": {},
// "brokensymlink": {}, "existingsymlink2": {},
// } }
// for _, info := range f { for _, info := range f {
// name, ok := wantNames[info.Name()] if _, ok := wantNames[info.Name()]; !ok {
// if !ok { return fmt.Errorf("could not find file or directory with name %v", info.Name())
// return fmt.Errorf("could not find file or directory with name %v", name) }
// } }
// }
// wantLength := len(wantNames) wantLength := len(wantNames)
// gotLength := len(f) gotLength := len(f)
// if wantLength != gotLength { if wantLength != gotLength {
// return fmt.Errorf("invalid amount of children, got %v, want %v", gotLength, wantLength) return fmt.Errorf("invalid amount of children, got %v, want %v", gotLength, wantLength)
// } }
// return nil return nil
// }, },
// true, true,
// true, true,
// }, },
// {
// "Can readdir 4 in /existingsymlink if there are multiple children and symlinks",
// "/existingsymlink",
// readdirArgs{4},
// false,
// func(f symFs) error {
// if err := f.MkdirAll("/mydir/nested", os.ModePerm); err != nil {
// return err
// }
// if _, err := f.Create("/mydir/nested/asdf.txt"); err != nil {
// return err
// }
// if _, err := f.Create("/mydir/nested/hmm.txt"); err != nil {
// return err
// }
// if _, err := f.Create("/mydir/nested/hmm2.txt"); err != nil {
// return err
// }
// if err := f.SymlinkIfPossible("/test.txt", "/mydir/nested/brokensymlink"); err != nil {
// return nil
// }
// if err := f.SymlinkIfPossible("/mydir/nested", "/existingsymlink"); err != nil {
// return nil
// }
// return nil
// },
// func(f []os.FileInfo) error {
// wantNames := map[string]struct{}{
// "asdf.txt": {},
// "hmm.txt": {},
// "hmm2.txt": {},
// "brokensymlink": {},
// }
// for _, info := range f {
// name, ok := wantNames[info.Name()]
// if !ok {
// return fmt.Errorf("could not find file or directory with name %v", name)
// }
// }
// wantLength := len(f)
// gotLength := 3
// if wantLength != gotLength {
// return fmt.Errorf("invalid amount of children, got %v, want %v", gotLength, wantLength)
// }
// return nil
// },
// true,
// true,
// },
} }
func TestFile_Readdir(t *testing.T) { func TestFile_Readdir(t *testing.T) {

2
pkg/fs/filesystem_test.go
View File

@@ -100,7 +100,7 @@ func TestMain(m *testing.M) {
flag.Parse() // So that `testing.Short` can be called, see https://go-review.googlesource.com/c/go/+/7604/ flag.Parse() // So that `testing.Short` can be called, see https://go-review.googlesource.com/c/go/+/7604/
if verbose { if verbose {
boil.DebugMode = false boil.DebugMode = true
boil.DebugWriter = os.Stderr boil.DebugWriter = os.Stderr
} }

33
pkg/persisters/metadata.go
View File

@@ -293,10 +293,10 @@ func (p *MetadataPersister) GetHeaderDirectChildren(ctx context.Context, name st
getHeaders := func(prefix string, useLinkname bool) ([]*config.Header, error) { getHeaders := func(prefix string, useLinkname bool) ([]*config.Header, error) {
pk := models.HeaderColumns.Name pk := models.HeaderColumns.Name
exclude := models.HeaderColumns.Linkname exclude := fmt.Sprintf(`%v = ""`, models.HeaderColumns.Linkname)
if useLinkname { if useLinkname {
pk = models.HeaderColumns.Linkname pk = models.HeaderColumns.Linkname
exclude = models.HeaderColumns.Name exclude = "1" // No need to exclude anything
} }
headers := []*config.Header{} headers := []*config.Header{}
@@ -313,7 +313,7 @@ where %v like ?
) )
) )
and %v != 1 and %v != 1
and %v = "" and %v
and not %v in ('', '.', '/', './')`, and not %v in ('', '.', '/', './')`,
models.HeaderColumns.Record, models.HeaderColumns.Record,
models.HeaderColumns.Lastknownrecord, models.HeaderColumns.Lastknownrecord,
@@ -389,11 +389,36 @@ where %v like ?
return nil, err return nil, err
} }
linknameHeaders, err := getHeaders(prefix, true) rawLinknameHeaders, err := getHeaders(prefix, true)
if err != nil { if err != nil {
return nil, err return nil, err
} }
linknameHeaders := []*config.Header{}
for _, link := range rawLinknameHeaders {
name := link.Name
linkname := link.Linkname
target, err := p.GetHeader(ctx, name)
if err != nil {
if err == sql.ErrNoRows {
link.Name = linkname
link.Linkname = name
linknameHeaders = append(linknameHeaders, link)
continue
} else {
return nil, err
}
}
target.Name = linkname
target.Linkname = name
linknameHeaders = append(linknameHeaders, target)
}
headers = append(headers, nameHeaders...) headers = append(headers, nameHeaders...)
headers = append(headers, linknameHeaders...) headers = append(headers, linknameHeaders...)