Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return CID from 'ipfs files flush' #6102

Merged
merged 2 commits into from
Mar 19, 2019
Merged

Return CID from 'ipfs files flush' #6102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca97b11
Update go-mfs
magik6k Mar 19, 2019
3d79102
Return CID from 'ipfs files flush'
magik6k Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions core/commands/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ var filesCpCmd = &cmds.Command{
}

if flush {
err := mfs.FlushPath(req.Context, nd.FilesRoot, dst)
_, err := mfs.FlushPath(req.Context, nd.FilesRoot, dst)
if err != nil {
return fmt.Errorf("cp: cannot flush the created file %s: %s", dst, err)
}
Expand Down Expand Up @@ -649,7 +649,7 @@ Example:

err = mfs.Mv(nd.FilesRoot, src, dst)
if err == nil && flush {
err = mfs.FlushPath(req.Context, nd.FilesRoot, "/")
_, err = mfs.FlushPath(req.Context, nd.FilesRoot, "/")
}
return err
},
Expand Down Expand Up @@ -856,6 +856,10 @@ Examples:
},
}

type flushRes struct {
Cid string
}

var filesFlushCmd = &cmds.Command{
Helptext: cmdkit.HelpText{
Tagline: "Flush a given path's data to disk.",
Expand All @@ -873,13 +877,24 @@ are run with the '--flush=false'.
return err
}

enc, err := cmdenv.GetCidEncoder(req)
if err != nil {
return err
}

path := "/"
if len(req.Arguments) > 0 {
path = req.Arguments[0]
}

return mfs.FlushPath(req.Context, nd.FilesRoot, path)
n, err := mfs.FlushPath(req.Context, nd.FilesRoot, path)
if err != nil {
return err
}

return cmds.EmitOnce(res, &flushRes{enc.Encode(n.Cid())})
},
Type: flushRes{},
}

var filesChcidCmd = &cmds.Command{
Expand Down Expand Up @@ -916,7 +931,7 @@ Change the cid version or hash function of the root node of a given path.

err = updatePath(nd.FilesRoot, path, prefix)
if err == nil && flush {
err = mfs.FlushPath(req.Context, nd.FilesRoot, path)
_, err = mfs.FlushPath(req.Context, nd.FilesRoot, path)
}
return err
},
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ require (
github.com/ipfs/go-merkledag v0.0.2
github.com/ipfs/go-metrics-interface v0.0.1
github.com/ipfs/go-metrics-prometheus v0.0.1
github.com/ipfs/go-mfs v0.0.3
github.com/ipfs/go-mfs v0.0.4
github.com/ipfs/go-path v0.0.2
github.com/ipfs/go-unixfs v0.0.2
github.com/ipfs/go-verifcid v0.0.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ github.com/ipfs/go-metrics-prometheus v0.0.1 h1:5iY3WO20WFSOErZyyYemHsbGm0V+a8YN
github.com/ipfs/go-metrics-prometheus v0.0.1/go.mod h1:ELLU99AQQNi+zX6GCGm2lAgnzdSH3u5UVlCdqSXnEks=
github.com/ipfs/go-mfs v0.0.3 h1:gFBlZw9DpZXaxqeto1H9uLkg+qzE8EVbCIVD2yuKUU4=
github.com/ipfs/go-mfs v0.0.3/go.mod h1:rUT0dKNWkKa1T+MobpBL2zANn7p8Y6unXANC0PV2FLk=
github.com/ipfs/go-mfs v0.0.4 h1:34qX5A7mQTYTkszSKIAFr+Y7BbvwVjHW9mzHDxSUqTo=
github.com/ipfs/go-mfs v0.0.4/go.mod h1:rUT0dKNWkKa1T+MobpBL2zANn7p8Y6unXANC0PV2FLk=
github.com/ipfs/go-path v0.0.1 h1:6UskTq8xYVs3zVnHjXDvoCqw22dKWK1BwD1cy1cuHyc=
github.com/ipfs/go-path v0.0.1/go.mod h1:ztzG4iSBN2/CJa93rtHAv/I+mpK+BGALeUoJzhclhw0=
github.com/ipfs/go-path v0.0.2 h1:Nm9g9GCo3XoSASPh2cGEW9eGPt8xh0QzA1VNO69NTMs=
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,9 +531,9 @@
},
{
"author": "hsanjuan",
"hash": "QmUpYgeayfk3b83aYfNzVXwJJvyYsBrtKJtsnPfyjbgcgb",
"hash": "QmX1nx1HZoyRKpp1d5L52kvcfqMbdbV6k4LFFrCEv7wnpH",
"name": "go-mfs",
"version": "0.1.51"
"version": "0.1.52"
},
{
"author": "kevina",
Expand Down