coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-03-06 00:38:08 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

coreapi: remove Unixfs.Wrap

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera 2019-03-25 19:00:51 +01:00
parent 8c96e3be90
commit 95906d3201
2 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/coreapi/unixfs.go
View File

@ -87,7 +87,6 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options
fileAdder.Out = settings.Events
fileAdder.Progress = settings.Progress
}
fileAdder.Wrap = settings.Wrap
fileAdder.Pin = settings.Pin && !settings.OnlyHash
fileAdder.Silent = settings.Silent
fileAdder.RawLeaves = settings.RawLeaves

27
core/coreunix/add.go
View File

@ -51,7 +51,6 @@ func NewAdder(ctx context.Context, p pin.Pinner, bs bstore.GCLocker, ds ipld.DAG
Progress: false,
Pin: true,
Trickle: false,
Wrap: false,
Chunker: "",
}, nil
}
@ -69,7 +68,6 @@ type Adder struct {
Trickle bool
RawLeaves bool
Silent bool
Wrap bool
NoCopy bool
Chunker string
root ipld.Node
@ -144,8 +142,8 @@ func (adder *Adder) curRootNode() (ipld.Node, error) {
return nil, err
}
// if not wrapping, AND one root file, use that hash as root.
if !adder.Wrap && len(root.Links()) == 1 {
// if one root file, use that hash as root.
if len(root.Links()) == 1 {
nd, err := root.Links()[0].GetNode(adder.ctx, adder.dagService)
if err != nil {
return nil, err
@ -288,7 +286,7 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
// directory, mfs root is the directory)
_, dir := file.(files.Directory)
var name string
if !adder.Wrap && !dir {
if !dir {
children, err := rootdir.ListNames(adder.ctx)
if err != nil {
return nil, err
@ -316,25 +314,6 @@ func (adder *Adder) AddAllAndPin(file files.Node) (ipld.Node, error) {
return nil, err
}
// when adding wrapped directory, manually wrap here
if adder.Wrap && dir {
name = nd.Cid().String()
end := unixfs.EmptyDirNode()
if err := end.AddNodeLink(nd.Cid().String(), nd); err != nil {
return nil, err
}
nd = end
if err := adder.dagService.Add(adder.ctx, end); err != nil {
return nil, err
}
if err := outputDagnode(adder.Out, "", nd); err != nil {
return nil, err
}
}
// output directory events
err = adder.outputDirs(name, root)
if err != nil {