rdelaage
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fuse: rename child/children -> node/items

This commit is contained in:
Alexander Neumann 2015-07-21 21:34:59 +02:00
parent 3f4b5b8d48
commit 9911d46996
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
cmd/restic/fuse/dir.go
View File

@ -16,9 +16,9 @@ var _ = fs.HandleReadDirAller(&dir{})
var _ = fs.NodeStringLookuper(&dir{}) var _ = fs.NodeStringLookuper(&dir{})
type dir struct { type dir struct {
repo *repository.Repository repo *repository.Repository
children map[string]*restic.Node items map[string]*restic.Node
inode uint64 inode uint64
} }
func newDir(repo *repository.Repository, node *restic.Node) (*dir, error) { func newDir(repo *repository.Repository, node *restic.Node) (*dir, error) {
@ -26,15 +26,15 @@ func newDir(repo *repository.Repository, node *restic.Node) (*dir, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
children := make(map[string]*restic.Node) items := make(map[string]*restic.Node)
for _, child := range tree.Nodes { for _, node := range tree.Nodes {
children[child.Name] = child items[node.Name] = node
} }
return &dir{ return &dir{
repo: repo, repo: repo,
children: children, items: items,
inode: node.Inode, inode: node.Inode,
}, nil }, nil
} }
@ -43,15 +43,15 @@ func newDirFromSnapshot(repo *repository.Repository, snapshot SnapshotWithId) (*
if err != nil { if err != nil {
return nil, err return nil, err
} }
children := make(map[string]*restic.Node) items := make(map[string]*restic.Node)
for _, node := range tree.Nodes { for _, node := range tree.Nodes {
children[node.Name] = node items[node.Name] = node
} }
return &dir{ return &dir{
repo: repo, repo: repo,
children: children, items: items,
inode: inodeFromBackendId(snapshot.ID), inode: inodeFromBackendId(snapshot.ID),
}, nil }, nil
} }
@ -62,9 +62,9 @@ func (d *dir) Attr(ctx context.Context, a *fuse.Attr) error {
} }
func (d *dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) { func (d *dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
ret := make([]fuse.Dirent, 0, len(d.children)) ret := make([]fuse.Dirent, 0, len(d.items))
for _, node := range d.children { for _, node := range d.items {
var typ fuse.DirentType var typ fuse.DirentType
switch node.Type { switch node.Type {
case "dir": case "dir":
@ -86,17 +86,17 @@ func (d *dir) ReadDirAll(ctx context.Context) ([]fuse.Dirent, error) {
} }
func (d *dir) Lookup(ctx context.Context, name string) (fs.Node, error) { func (d *dir) Lookup(ctx context.Context, name string) (fs.Node, error) {
child, ok := d.children[name] node, ok := d.items[name]
if !ok { if !ok {
return nil, fuse.ENOENT return nil, fuse.ENOENT
} }
switch child.Type { switch node.Type {
case "dir": case "dir":
return newDir(d.repo, child) return newDir(d.repo, node)
case "file": case "file":
return newFile(d.repo, child) return newFile(d.repo, node)
case "symlink": case "symlink":
return newLink(d.repo, child) return newLink(d.repo, node)
default: default:
return nil, fuse.ENOENT return nil, fuse.ENOENT
} }