From 95906d3201bef63b463fef72d0461599d915bf20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Mon, 25 Mar 2019 19:00:51 +0100 Subject: [PATCH 1/2] coreapi: remove Unixfs.Wrap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit License: MIT Signed-off-by: Łukasz Magiera --- core/coreapi/unixfs.go | 1 - core/coreunix/add.go | 27 +++------------------------ 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/core/coreapi/unixfs.go b/core/coreapi/unixfs.go index ce0ecf8fe82..e4fb0f2e250 100644 --- a/core/coreapi/unixfs.go +++ b/core/coreapi/unixfs.go @@ -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 diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 4fc749c067a..9ecc8a4f5b9 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -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 { From 353dd674d1f7b84d3538a0ad64924f0c95da0ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Mon, 25 Mar 2019 19:01:04 +0100 Subject: [PATCH 2/2] gomod: update coreiface MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit License: MIT Signed-off-by: Łukasz Magiera --- go.mod | 4 ++-- go.sum | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index a4a9f9c55f2..107face83db 100644 --- a/go.mod +++ b/go.mod @@ -51,10 +51,10 @@ require ( github.com/ipfs/go-metrics-prometheus v0.0.2 github.com/ipfs/go-mfs v0.0.4 github.com/ipfs/go-path v0.0.3 - github.com/ipfs/go-unixfs v0.0.3 + github.com/ipfs/go-unixfs v0.0.4 github.com/ipfs/go-verifcid v0.0.1 github.com/ipfs/hang-fds v0.0.1 - github.com/ipfs/interface-go-ipfs-core v0.0.4 + github.com/ipfs/interface-go-ipfs-core v0.0.5 github.com/ipfs/iptb v1.4.0 github.com/ipfs/iptb-plugins v0.0.2 github.com/jbenet/go-is-domain v1.0.2 diff --git a/go.sum b/go.sum index 0fb3221bc3c..e8180afd0bc 100644 --- a/go.sum +++ b/go.sum @@ -202,12 +202,18 @@ github.com/ipfs/go-unixfs v0.0.1 h1:CTTGqLxU5+PRkkeA+w1peStqRWFD1Kya+yZgIT4Xy1w= github.com/ipfs/go-unixfs v0.0.1/go.mod h1:ZlB83nMtxNMx4DAAE5/GixeKN1qHC+xspBksI7Q5NeI= github.com/ipfs/go-unixfs v0.0.3 h1:09koecZaoJVoYy6Wkd/vo1lyQ4AdgAe83eJylQ7gAZw= github.com/ipfs/go-unixfs v0.0.3/go.mod h1:FX/6aS/Xg95JRc6UMyiMdZeNn+N5VkD8/yfLNwKW0Ks= +github.com/ipfs/go-unixfs v0.0.4 h1:IApzQ+SnY0tfjqM7aU2b80CFYLZNHvhLmEZDIWr4e/E= +github.com/ipfs/go-unixfs v0.0.4/go.mod h1:eIo/p9ADu/MFOuyxzwU+Th8D6xoxU//r590vUpWyfz8= github.com/ipfs/go-verifcid v0.0.1 h1:m2HI7zIuR5TFyQ1b79Da5N9dnnCP1vcu2QqawmWlK2E= github.com/ipfs/go-verifcid v0.0.1/go.mod h1:5Hrva5KBeIog4A+UpqlaIU+DEstipcJYQQZc0g37pY0= github.com/ipfs/hang-fds v0.0.1 h1:KGAxiGtJPT3THVRNT6yxgpdFPeX4ZemUjENOt6NlOn4= github.com/ipfs/hang-fds v0.0.1/go.mod h1:U4JNbzwTpk/qP2Ms4VgrZ4HcgJGVosBJqMXvwe4udSY= github.com/ipfs/interface-go-ipfs-core v0.0.4 h1:bMsRGLkttV8Y5C1VyeSePVxEatRGwS9pRdhNkWOt+cY= github.com/ipfs/interface-go-ipfs-core v0.0.4/go.mod h1:AOUhAfBqYu3G6Ocn+Y6rgWUWjp2zdPZiCLr8QS1TEKg= +github.com/ipfs/interface-go-ipfs-core v0.0.5-0.20190325175850-33e0648669fb h1:kMcvq1emnbfUoWoHuq+m7JGO+rsuiN8jjuNB7bsR0WI= +github.com/ipfs/interface-go-ipfs-core v0.0.5-0.20190325175850-33e0648669fb/go.mod h1:VceUOYu+kPEy8Ev/gAhzXFTIfc/7xILKnL4fgZg8tZM= +github.com/ipfs/interface-go-ipfs-core v0.0.5 h1:lePQnz+SqDupeDrVWtzEIjZlcYAbG8tJLrttQWRmGRg= +github.com/ipfs/interface-go-ipfs-core v0.0.5/go.mod h1:VceUOYu+kPEy8Ev/gAhzXFTIfc/7xILKnL4fgZg8tZM= github.com/ipfs/iptb v1.4.0 h1:YFYTrCkLMRwk/35IMyC6+yjoQSHTEcNcefBStLJzgvo= github.com/ipfs/iptb v1.4.0/go.mod h1:1rzHpCYtNp87/+hTxG5TfCVn/yMY3dKnLn8tBiMfdmg= github.com/ipfs/iptb-plugins v0.0.2 h1:JZp4h/+7f00dY4Epr8gzF+VqKITXmVGsZabvmZp7E9I=