github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-23 07:04:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

mountlib: make sure Node is always set in DirEntry

Browse Source 
This simplifies the code and makes using the DirEntry.Node usable when
using ReadDir.
This commit is contained in:
Nick Craig-Wood 2017-10-25 10:06:37 +01:00
parent 750690503e
commit 3ec15ac2bd
1 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmd/mountlib/dir.go
View File

@ -14,8 +14,6 @@ import (
// DirEntry describes the contents of a directory entry // DirEntry describes the contents of a directory entry
// //
// It can be a file or a directory // It can be a file or a directory
//
// node may be nil, but o may not
type DirEntry struct { type DirEntry struct {
Obj fs.DirEntry Obj fs.DirEntry
Node Node Node Node
@ -205,7 +203,7 @@ func (d *Dir) _readDir() error {
name := path.Base(obj.Remote()) name := path.Base(obj.Remote())
d.items[name] = &DirEntry{ d.items[name] = &DirEntry{
Obj: obj, Obj: obj,
Node: nil, Node: newFile(d, obj, name),
} }
case fs.Directory: case fs.Directory:
dir := item dir := item
@ -221,7 +219,7 @@ func (d *Dir) _readDir() error {
} }
d.items[name] = &DirEntry{ d.items[name] = &DirEntry{
Obj: dir, Obj: dir,
Node: nil, Node: newDir(d.fsys, d.f, dir),
} }
default: default:
err = errors.Errorf("unknown type %T", item) err = errors.Errorf("unknown type %T", item)
@ -283,31 +281,6 @@ func (d *Dir) SetModTime(modTime time.Time) error {
return nil return nil
} }
// lookupNode calls lookup then makes sure the node is not nil in the DirEntry
func (d *Dir) lookupNode(leaf string) (item *DirEntry, err error) {
item, err = d.lookup(leaf)
if err != nil {
return nil, err
}
if item.Node != nil {
return item, nil
}
var node Node
switch x := item.Obj.(type) {
case fs.Object:
node, err = newFile(d, x, leaf), nil
case fs.Directory:
node, err = newDir(d.fsys, d.f, x), nil
default:
err = errors.Errorf("unknown type %T", item)
}
if err != nil {
return nil, err
}
item = d.addObject(item.Obj, node)
return item, nil
}
// Lookup looks up a specific entry in the receiver. // Lookup looks up a specific entry in the receiver.
// //
// Lookup should return a Node corresponding to the entry. If the // Lookup should return a Node corresponding to the entry. If the
@ -317,7 +290,7 @@ func (d *Dir) lookupNode(leaf string) (item *DirEntry, err error) {
func (d *Dir) Lookup(name string) (node Node, err error) { func (d *Dir) Lookup(name string) (node Node, err error) {
path := path.Join(d.path, name) path := path.Join(d.path, name)
// fs.Debugf(path, "Dir.Lookup") // fs.Debugf(path, "Dir.Lookup")
item, err := d.lookupNode(name) item, err := d.lookup(name)
if err != nil { if err != nil {
if err != ENOENT { if err != ENOENT {
fs.Errorf(path, "Dir.Lookup error: %v", err) fs.Errorf(path, "Dir.Lookup error: %v", err)
@ -392,7 +365,7 @@ func (d *Dir) Remove(name string) error {
} }
path := path.Join(d.path, name) path := path.Join(d.path, name)
// fs.Debugf(path, "Dir.Remove") // fs.Debugf(path, "Dir.Remove")
item, err := d.lookupNode(name) item, err := d.lookup(name)
if err != nil { if err != nil {
fs.Errorf(path, "Dir.Remove error: %v", err) fs.Errorf(path, "Dir.Remove error: %v", err)
return err return err
@ -440,7 +413,7 @@ func (d *Dir) Rename(oldName, newName string, destDir *Dir) error {
oldPath := path.Join(d.path, oldName) oldPath := path.Join(d.path, oldName)
newPath := path.Join(destDir.path, newName) newPath := path.Join(destDir.path, newName)
// fs.Debugf(oldPath, "Dir.Rename to %q", newPath) // fs.Debugf(oldPath, "Dir.Rename to %q", newPath)
oldItem, err := d.lookupNode(oldName) oldItem, err := d.lookup(oldName)
if err != nil { if err != nil {
fs.Errorf(oldPath, "Dir.Rename error: %v", err) fs.Errorf(oldPath, "Dir.Rename error: %v", err)
return err return err