coreiface: updates for path name refactor
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Mar 26, 2019 at 15:11 UTC
a54b64bedee45f67287f412ffa2780f8ac65306e
22 files changed
+48
-48
core/commands/block.go
+3
-3
@@ -65,7 +65,7 @@ on raw IPFS blocks. It outputs the following to stdout:
65
return err
66
}
67
68
- b, err := api.Block().Stat(req.Context, path.ParsePath(req.Arguments[0]))
68
+ b, err := api.Block().Stat(req.Context, path.New(req.Arguments[0]))
69
if err != nil {
70
return err
71
}
@@ -102,7 +102,7 @@ It outputs to stdout, and <key> is a base58 encoded multihash.
102
return err
103
}
104
105
- r, err := api.Block().Get(req.Context, path.ParsePath(req.Arguments[0]))
105
+ r, err := api.Block().Get(req.Context, path.New(req.Arguments[0]))
106
if err != nil {
107
return err
108
}
@@ -224,7 +224,7 @@ It takes a list of base58 encoded multihashes to remove.
224
225
// TODO: use batching coreapi when done
226
for _, b := range req.Arguments {
227
- rp, err := api.ResolvePath(req.Context, path.ParsePath(b))
227
+ rp, err := api.ResolvePath(req.Context, path.New(b))
228
229
err = api.Block().Rm(req.Context, rp, options.Block.Force(force))
230
if err != nil {
core/commands/cat.go
+1
-1
@@ -119,7 +119,7 @@ func cat(ctx context.Context, api iface.CoreAPI, paths []string, offset int64, m
119
return nil, 0, nil
120
}
121
for _, p := range paths {
122
- f, err := api.Unixfs().Get(ctx, path.ParsePath(p))
122
+ f, err := api.Unixfs().Get(ctx, path.New(p))
123
if err != nil {
124
return nil, 0, err
125
}
core/commands/dag/dag.go
+2
-2
@@ -159,7 +159,7 @@ format.
159
return err
160
}
161
162
- rp, err := api.ResolvePath(req.Context, path.ParsePath(req.Arguments[0]))
162
+ rp, err := api.ResolvePath(req.Context, path.New(req.Arguments[0]))
163
if err != nil {
164
return err
165
}
@@ -199,7 +199,7 @@ var DagResolveCmd = &cmds.Command{
199
return err
200
}
201
202
- rp, err := api.ResolvePath(req.Context, path.ParsePath(req.Arguments[0]))
202
+ rp, err := api.ResolvePath(req.Context, path.New(req.Arguments[0]))
203
if err != nil {
204
return err
205
}
core/commands/files.go
+1
-1
@@ -364,7 +364,7 @@ var filesCpCmd = &cmds.Command{
364
func getNodeFromPath(ctx context.Context, node *core.IpfsNode, api iface.CoreAPI, p string) (ipld.Node, error) {
365
switch {
366
case strings.HasPrefix(p, "/ipfs/"):
367
- return api.ResolveNode(ctx, path.ParsePath(p))
367
+ return api.ResolveNode(ctx, path.New(p))
368
default:
369
fsn, err := mfs.Lookup(node.FilesRoot, p)
370
if err != nil {
core/commands/get.go
+1
-1
@@ -71,7 +71,7 @@ may also specify the level of compression by specifying '-l=<1-9>'.
71
return err
72
}
73
74
- p := path.ParsePath(req.Arguments[0])
74
+ p := path.New(req.Arguments[0])
75
76
file, err := api.Unixfs().Get(req.Context, p)
77
if err != nil {
core/commands/ls.go
+1
-1
@@ -132,7 +132,7 @@ The JSON output contains type information.
132
}
133
134
for i, fpath := range paths {
135
- results, err := api.Unixfs().Ls(req.Context, path.ParsePath(fpath),
135
+ results, err := api.Unixfs().Ls(req.Context, path.New(fpath),
136
options.Unixfs.ResolveChildren(resolveSize || resolveType))
137
if err != nil {
138
return err
core/commands/name/publish.go
+1
-1
@@ -113,7 +113,7 @@ Alternatively, publish an <ipfs-path> using a valid PeerID (as listed by
113
opts = append(opts, options.Name.TTL(d))
114
}
115
116
- p := path.ParsePath(req.Arguments[0])
116
+ p := path.New(req.Arguments[0])
117
118
if verifyExists, _ := req.Options[resolveOptionName].(bool); verifyExists {
119
_, err := api.ResolveNode(req.Context, p)
core/commands/object/diff.go
+2
-2
@@ -60,8 +60,8 @@ Example:
60
return err
61
}
62
63
- pa := path.ParsePath(req.Arguments[0])
64
- pb := path.ParsePath(req.Arguments[1])
63
+ pa := path.New(req.Arguments[0])
64
+ pb := path.New(req.Arguments[1])
65
66
changes, err := api.Object().Diff(req.Context, pa, pb)
67
if err != nil {
core/commands/object/object.go
+4
-4
@@ -91,7 +91,7 @@ is the raw data of the object.
91
return err
92
}
93
94
- path := path.ParsePath(req.Arguments[0])
94
+ path := path.New(req.Arguments[0])
95
96
data, err := api.Object().Data(req.Context, path)
97
if err != nil {
@@ -130,7 +130,7 @@ multihash.
130
return err
131
}
132
133
- path := path.ParsePath(req.Arguments[0])
133
+ path := path.New(req.Arguments[0])
134
135
rp, err := api.ResolvePath(req.Context, path)
136
if err != nil {
@@ -222,7 +222,7 @@ Supported values are:
222
return err
223
}
224
225
- path := path.ParsePath(req.Arguments[0])
225
+ path := path.New(req.Arguments[0])
226
227
datafieldenc, _ := req.Options[encodingOptionName].(string)
228
if err != nil {
@@ -314,7 +314,7 @@ var ObjectStatCmd = &cmds.Command{
314
return err
315
}
316
317
- ns, err := api.Object().Stat(req.Context, path.ParsePath(req.Arguments[0]))
317
+ ns, err := api.Object().Stat(req.Context, path.New(req.Arguments[0]))
318
if err != nil {
319
return err
320
}
core/commands/object/patch.go
+5
-5
@@ -55,7 +55,7 @@ the limit will not be respected by the network.
55
return err
56
}
57
58
- root := path.ParsePath(req.Arguments[0])
58
+ root := path.New(req.Arguments[0])
59
60
file, err := cmdenv.GetFileArg(req.Files.Entries())
61
if err != nil {
@@ -99,7 +99,7 @@ Example:
99
return err
100
}
101
102
- root := path.ParsePath(req.Arguments[0])
102
+ root := path.New(req.Arguments[0])
103
104
file, err := cmdenv.GetFileArg(req.Files.Entries())
105
if err != nil {
@@ -139,7 +139,7 @@ Remove a Merkle-link from the given object and return the hash of the result.
139
return err
140
}
141
142
- root := path.ParsePath(req.Arguments[0])
142
+ root := path.New(req.Arguments[0])
143
144
name := req.Arguments[1]
145
p, err := api.Object().RmLink(req.Context, root, name)
@@ -192,9 +192,9 @@ to a file containing 'bar', and returns the hash of the new object.
192
return err
193
}
194
195
- root := path.ParsePath(req.Arguments[0])
195
+ root := path.New(req.Arguments[0])
196
name := req.Arguments[1]
197
- child := path.ParsePath(req.Arguments[2])
197
+ child := path.New(req.Arguments[2])
198
199
create, _ := req.Options[createOptionName].(bool)
200
if err != nil {
core/commands/pin.go
+5
-5
@@ -184,7 +184,7 @@ var addPinCmd = &cmds.Command{
184
func pinAddMany(ctx context.Context, api coreiface.CoreAPI, enc cidenc.Encoder, paths []string, recursive bool) ([]string, error) {
185
added := make([]string, len(paths))
186
for i, b := range paths {
187
- rp, err := api.ResolvePath(ctx, path.ParsePath(b))
187
+ rp, err := api.ResolvePath(ctx, path.New(b))
188
if err != nil {
189
return nil, err
190
}
@@ -234,7 +234,7 @@ collected if needed. (By default, recursively. Use -r=false for direct pins.)
234
235
pins := make([]string, 0, len(req.Arguments))
236
for _, b := range req.Arguments {
237
- rp, err := api.ResolvePath(req.Context, path.ParsePath(b))
237
+ rp, err := api.ResolvePath(req.Context, path.New(b))
238
if err != nil {
239
return err
240
}
@@ -408,8 +408,8 @@ new pin and removing the old one.
408
409
unpin, _ := req.Options[pinUnpinOptionName].(bool)
410
411
- from := path.ParsePath(req.Arguments[0])
412
- to := path.ParsePath(req.Arguments[1])
411
+ from := path.New(req.Arguments[0])
412
+ to := path.New(req.Arguments[1])
413
414
err = api.Pin().Update(req.Context, from, to, options.Pin.Unpin(unpin))
415
if err != nil {
@@ -498,7 +498,7 @@ func pinLsKeys(ctx context.Context, args []string, typeStr string, n *core.IpfsN
498
keys := make(map[cid.Cid]RefKeyObject)
499
500
for _, p := range args {
501
- c, err := api.ResolvePath(ctx, path.ParsePath(p))
501
+ c, err := api.ResolvePath(ctx, path.New(p))
502
if err != nil {
503
return nil, err
504
}
core/commands/resolve.go
+1
-1
@@ -130,7 +130,7 @@ Resolve the value of an IPFS DAG path:
130
}
131
132
// else, ipfs path or ipns with recursive flag
133
- rp, err := api.ResolvePath(req.Context, path.ParsePath(name))
133
+ rp, err := api.ResolvePath(req.Context, path.New(name))
134
if err != nil {
135
return err
136
}
core/commands/unixfs/ls.go
+1
-1
@@ -96,7 +96,7 @@ possible, please use 'ipfs ls' instead.
96
for _, p := range paths {
97
ctx := req.Context
98
99
- merkleNode, err := api.ResolveNode(ctx, path.ParsePath(p))
99
+ merkleNode, err := api.ResolveNode(ctx, path.New(p))
100
if err != nil {
101
return err
102
}
core/coreapi/block.go
+2
-2
@@ -20,7 +20,7 @@ import (
20
type BlockAPI CoreAPI
21
22
type BlockStat struct {
23
- path path.ResolvedPath
23
+ path path.Resolved
24
size int
25
}
26
@@ -134,7 +134,7 @@ func (bs *BlockStat) Size() int {
134
return bs.size
135
}
136
137
-func (bs *BlockStat) Path() path.ResolvedPath {
137
+func (bs *BlockStat) Path() path.Resolved {
138
return bs.path
139
}
140
core/coreapi/key.go
+1
-1
@@ -29,7 +29,7 @@ func (k *key) Name() string {
29
30
// Path returns the path of the key.
31
func (k *key) Path() path.Path {
32
- return path.ParsePath(ipfspath.Join([]string{"/ipns", k.peerID.Pretty()}))
32
+ return path.New(ipfspath.Join([]string{"/ipns", k.peerID.Pretty()}))
33
}
34
35
// ID returns key PeerID
core/coreapi/name.go
+1
-1
@@ -108,7 +108,7 @@ func (api *NameAPI) Search(ctx context.Context, name string, opts ...caopts.Name
108
defer close(out)
109
for res := range resolver.ResolveAsync(ctx, name, options.ResolveOpts...) {
110
select {
111
- case out <- coreiface.IpnsResult{Path: path.ParsePath(res.Path.String()), Err: res.Err}:
111
+ case out <- coreiface.IpnsResult{Path: path.New(res.Path.String()), Err: res.Err}:
112
case <-ctx.Done():
113
return
114
}
core/coreapi/object.go
+6
-6
@@ -58,7 +58,7 @@ func (api *ObjectAPI) New(ctx context.Context, opts ...caopts.ObjectNewOption) (
58
return n, nil
59
}
60
61
-func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.ObjectPutOption) (ipath.ResolvedPath, error) {
61
+func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.ObjectPutOption) (ipath.Resolved, error) {
62
options, err := caopts.ObjectPutOptions(opts...)
63
if err != nil {
64
return nil, err
@@ -194,7 +194,7 @@ func (api *ObjectAPI) Stat(ctx context.Context, path ipath.Path) (*coreiface.Obj
194
return out, nil
195
}
196
197
-func (api *ObjectAPI) AddLink(ctx context.Context, base ipath.Path, name string, child ipath.Path, opts ...caopts.ObjectAddLinkOption) (ipath.ResolvedPath, error) {
197
+func (api *ObjectAPI) AddLink(ctx context.Context, base ipath.Path, name string, child ipath.Path, opts ...caopts.ObjectAddLinkOption) (ipath.Resolved, error) {
198
options, err := caopts.ObjectAddLinkOptions(opts...)
199
if err != nil {
200
return nil, err
@@ -235,7 +235,7 @@ func (api *ObjectAPI) AddLink(ctx context.Context, base ipath.Path, name string,
235
return ipath.IpfsPath(nnode.Cid()), nil
236
}
237
238
-func (api *ObjectAPI) RmLink(ctx context.Context, base ipath.Path, link string) (ipath.ResolvedPath, error) {
238
+func (api *ObjectAPI) RmLink(ctx context.Context, base ipath.Path, link string) (ipath.Resolved, error) {
239
baseNd, err := api.core().ResolveNode(ctx, base)
240
if err != nil {
241
return nil, err
@@ -261,15 +261,15 @@ func (api *ObjectAPI) RmLink(ctx context.Context, base ipath.Path, link string)
261
return ipath.IpfsPath(nnode.Cid()), nil
262
}
263
264
-func (api *ObjectAPI) AppendData(ctx context.Context, path ipath.Path, r io.Reader) (ipath.ResolvedPath, error) {
264
+func (api *ObjectAPI) AppendData(ctx context.Context, path ipath.Path, r io.Reader) (ipath.Resolved, error) {
265
return api.patchData(ctx, path, r, true)
266
}
267
268
-func (api *ObjectAPI) SetData(ctx context.Context, path ipath.Path, r io.Reader) (ipath.ResolvedPath, error) {
268
+func (api *ObjectAPI) SetData(ctx context.Context, path ipath.Path, r io.Reader) (ipath.Resolved, error) {
269
return api.patchData(ctx, path, r, false)
270
}
271
272
-func (api *ObjectAPI) patchData(ctx context.Context, path ipath.Path, r io.Reader, appendData bool) (ipath.ResolvedPath, error) {
272
+func (api *ObjectAPI) patchData(ctx context.Context, path ipath.Path, r io.Reader, appendData bool) (ipath.Resolved, error) {
273
nd, err := api.core().ResolveNode(ctx, path)
274
if err != nil {
275
return nil, err
core/coreapi/path.go
+3
-3
@@ -33,9 +33,9 @@ func (api *CoreAPI) ResolveNode(ctx context.Context, p path.Path) (ipld.Node, er
33
34
// ResolvePath resolves the path `p` using Unixfs resolver, returns the
35
// resolved path.
36
-func (api *CoreAPI) ResolvePath(ctx context.Context, p path.Path) (path.ResolvedPath, error) {
37
- if _, ok := p.(path.ResolvedPath); ok {
38
- return p.(path.ResolvedPath), nil
36
+func (api *CoreAPI) ResolvePath(ctx context.Context, p path.Path) (path.Resolved, error) {
37
+ if _, ok := p.(path.Resolved); ok {
38
+ return p.(path.Resolved), nil
39
}
40
if err := p.IsValid(); err != nil {
41
return nil, err
core/coreapi/pin.go
+4
-4
@@ -108,7 +108,7 @@ type pinStatus struct {
108
109
// BadNode is used in PinVerifyRes
110
type badNode struct {
111
- path path.ResolvedPath
111
+ path path.Resolved
112
err error
113
}
114
@@ -120,7 +120,7 @@ func (s *pinStatus) BadNodes() []coreiface.BadPinNode {
120
return s.badNodes
121
}
122
123
-func (n *badNode) Path() path.ResolvedPath {
123
+func (n *badNode) Path() path.Resolved {
124
return n.path
125
}
126
@@ -175,10 +175,10 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro
175
176
type pinInfo struct {
177
pinType string
178
- path path.ResolvedPath
178
+ path path.Resolved
179
}
180
181
-func (p *pinInfo) Path() path.ResolvedPath {
181
+func (p *pinInfo) Path() path.Resolved {
182
return p.path
183
}
184
core/coreapi/unixfs.go
+1
-1
@@ -30,7 +30,7 @@ type UnixfsAPI CoreAPI
30
31
// Add builds a merkledag node from a reader, adds it to the blockstore,
32
// and returns the key representing that node.
33
-func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options.UnixfsAddOption) (path.ResolvedPath, error) {
33
+func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options.UnixfsAddOption) (path.Resolved, error) {
34
settings, prefix, err := options.UnixfsAddOptions(opts...)
35
if err != nil {
36
return nil, err
core/corehttp/gateway_handler.go
+1
-1
@@ -148,7 +148,7 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
148
ipnsHostname = true
149
}
150
151
- parsedPath := ipath.ParsePath(urlPath)
151
+ parsedPath := ipath.New(urlPath)
152
if err := parsedPath.IsValid(); err != nil {
153
webError(w, "invalid ipfs path", err, http.StatusBadRequest)
154
return
fuse/readonly/ipfs_test.go
+1
-1
@@ -184,7 +184,7 @@ func TestIpfsStressRead(t *testing.T) {
184
defer wg.Done()
185
186
for i := 0; i < 2000; i++ {
187
- item := ipath.ParsePath(paths[rand.Intn(len(paths))])
187
+ item := ipath.New(paths[rand.Intn(len(paths))])
188
189
relpath := strings.Replace(item.String(), item.Namespace(), "", 1)
190
fname := path.Join(mnt.Dir, relpath)