coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-24 20:07:45 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

just flush dir in mkdir flush, not whole tree

Browse Source 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
This commit is contained in:
Jeromy 2015-12-18 22:12:39 -08:00
parent e3769dfb5a
commit f548a404ae
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/commands/files/files.go
View File

@ -586,24 +586,17 @@ Examples:
return
}
err = mfs.Mkdir(n.FilesRoot, dirtomake, dashp)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
flush, found, _ := req.Option("flush").Bool()
if !found {
flush = true
}
if flush {
err := n.FilesRoot.Flush()
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
err = mfs.Mkdir(n.FilesRoot, dirtomake, dashp, flush)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
}
},
}

4
core/coreunix/add.go
View File

@ -330,7 +330,7 @@ func (adder *Adder) addNode(node *dag.Node, path string) error {
dir := gopath.Dir(path)
if dir != "." {
if err := mfs.Mkdir(adder.mr, dir, true); err != nil {
if err := mfs.Mkdir(adder.mr, dir, true, false); err != nil {
return err
}
}
@ -403,7 +403,7 @@ func (adder *Adder) addFile(file files.File) error {
func (adder *Adder) addDir(dir files.File) error {
log.Infof("adding directory: %s", dir.FileName())
err := mfs.Mkdir(adder.mr, dir.FileName(), true)
err := mfs.Mkdir(adder.mr, dir.FileName(), true, false)
if err != nil {
return err
}

22
mfs/dir.go
View File

@ -278,11 +278,6 @@ func (d *Directory) Mkdir(name string) (*Directory, error) {
return nil, err
}
err = d.flushUp()
if err != nil {
return nil, err
}
dirobj := NewDirectory(d.ctx, name, ndir, d, d.dserv)
d.childDirs[name] = dirobj
return dirobj, nil
@ -300,14 +295,23 @@ func (d *Directory) Unlink(name string) error {
return err
}
return d.flushUp()
}
func (d *Directory) flushUp() error {
_, err = d.dserv.Add(d.node)
if err != nil {
return err
}
return d.parent.closeChild(d.name, d.node)
}
func (d *Directory) Flush() error {
nd, err := d.flushCurrentNode()
if err != nil {
return err
}
return d.parent.closeChild(d.name, nd)
}
// AddChild adds the node 'nd' under this directory giving it the name 'name'
func (d *Directory) AddChild(name string, nd *dag.Node) error {
d.lock.Lock()

11
mfs/ops.go
View File

@ -100,7 +100,7 @@ func PutNode(r *Root, path string, nd *dag.Node) error {
// Mkdir creates a directory at 'path' under the directory 'd', creating
// intermediary directories as needed if 'parents' is set to true
func Mkdir(r *Root, pth string, parents bool) error {
func Mkdir(r *Root, pth string, parents bool, flush bool) error {
if pth == "" {
return nil
}
@ -142,13 +142,20 @@ func Mkdir(r *Root, pth string, parents bool) error {
cur = next
}
_, err := cur.Mkdir(parts[len(parts)-1])
final, err := cur.Mkdir(parts[len(parts)-1])
if err != nil {
if !parents || err != os.ErrExist {
return err
}
}
if flush {
err := final.Flush()
if err != nil {
return err
}
}
return nil
}