Skip to content

Commit 4fd8a6e

Browse files
StebalienStebalien
authored
Merge pull request #5392 from ipfs/refactor/name-cmd-dir
name cmd: move subcommands to subdirectory
2 parents 30fe06c + faf7aac commit 4fd8a6e

27 files changed

+195
-174
lines changed

‎core/commands/add.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"strings"
99

1010
core "github.com/ipfs/go-ipfs/core"
11+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1112
"github.com/ipfs/go-ipfs/core/coreunix"
1213
filestore "github.com/ipfs/go-ipfs/filestore"
1314
ft "gx/ipfs/QmQjEpRiwVvtowhq69dAtB4jhioPVFXiCcWZm9Sfgn7eqc/go-unixfs"
@@ -141,7 +142,7 @@ You can now check what blocks have been created by:
141142
return nil
142143
},
143144
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
144-
n, err := GetNode(env)
145+
n, err := cmdenv.GetNode(env)
145146
if err != nil {
146147
res.SetError(err, cmdkit.ErrNormal)
147148
return

‎core/commands/bitswap.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
oldcmds "github.com/ipfs/go-ipfs/commands"
99
lgc "github.com/ipfs/go-ipfs/commands/legacy"
10+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1011
e "github.com/ipfs/go-ipfs/core/commands/e"
1112
bitswap "gx/ipfs/QmTtmrK4iiM3MxWNA3pvbM9ekQiGZAiFyo57GP8B9FFgtz/go-bitswap"
1213
decision "gx/ipfs/QmTtmrK4iiM3MxWNA3pvbM9ekQiGZAiFyo57GP8B9FFgtz/go-bitswap/decision"
@@ -48,7 +49,7 @@ var unwantCmd = &oldcmds.Command{
4849
}
4950

5051
if !nd.OnlineMode() {
51-
res.SetError(errNotOnline, cmdkit.ErrClient)
52+
res.SetError(ErrNotOnline, cmdkit.ErrClient)
5253
return
5354
}
5455

@@ -97,7 +98,7 @@ Print out all blocks currently on the bitswap wantlist for the local peer.`,
9798
}
9899

99100
if !nd.OnlineMode() {
100-
res.SetError(errNotOnline, cmdkit.ErrClient)
101+
res.SetError(ErrNotOnline, cmdkit.ErrClient)
101102
return
102103
}
103104

@@ -140,14 +141,14 @@ var bitswapStatCmd = &cmds.Command{
140141
},
141142
Type: bitswap.Stat{},
142143
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
143-
nd, err := GetNode(env)
144+
nd, err := cmdenv.GetNode(env)
144145
if err != nil {
145146
res.SetError(err, cmdkit.ErrNormal)
146147
return
147148
}
148149

149150
if !nd.OnlineMode() {
150-
res.SetError(errNotOnline, cmdkit.ErrClient)
151+
res.SetError(ErrNotOnline, cmdkit.ErrClient)
151152
return
152153
}
153154

@@ -215,7 +216,7 @@ prints the ledger associated with a given peer.
215216
}
216217

217218
if !nd.OnlineMode() {
218-
res.SetError(errNotOnline, cmdkit.ErrClient)
219+
res.SetError(ErrNotOnline, cmdkit.ErrClient)
219220
return
220221
}
221222

@@ -272,7 +273,7 @@ Trigger reprovider to announce our data to network.
272273
}
273274

274275
if !nd.OnlineMode() {
275-
res.SetError(errNotOnline, cmdkit.ErrClient)
276+
res.SetError(ErrNotOnline, cmdkit.ErrClient)
276277
return
277278
}
278279

‎core/commands/block.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"os"
1111

1212
util "github.com/ipfs/go-ipfs/blocks/blockstoreutil"
13+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1314
e "github.com/ipfs/go-ipfs/core/commands/e"
1415

1516
"gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
@@ -137,7 +138,7 @@ than 'sha2-256' or format to anything other than 'v0' will result in CIDv1.
137138
cmdkit.IntOption("mhlen", "multihash hash length").WithDefault(-1),
138139
},
139140
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
140-
n, err := GetNode(env)
141+
n, err := cmdenv.GetNode(env)
141142
if err != nil {
142143
res.SetError(err, cmdkit.ErrNormal)
143144
return
@@ -248,7 +249,7 @@ func getBlockForKey(ctx context.Context, env cmds.Environment, skey string) (blo
248249
return nil, fmt.Errorf("zero length cid invalid")
249250
}
250251

251-
n, err := GetNode(env)
252+
n, err := cmdenv.GetNode(env)
252253
if err != nil {
253254
return nil, err
254255
}
@@ -282,7 +283,7 @@ It takes a list of base58 encoded multihashes to remove.
282283
cmdkit.BoolOption("quiet", "q", "Write minimal output."),
283284
},
284285
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
285-
n, err := GetNode(env)
286+
n, err := cmdenv.GetNode(env)
286287
if err != nil {
287288
res.SetError(err, cmdkit.ErrNormal)
288289
return

‎core/commands/cat.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"os"
88

99
core "github.com/ipfs/go-ipfs/core"
10+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1011
coreunix "github.com/ipfs/go-ipfs/core/coreunix"
1112

1213
cmds "gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
@@ -29,7 +30,7 @@ var CatCmd = &cmds.Command{
2930
cmdkit.IntOption("length", "l", "Maximum number of bytes to read."),
3031
},
3132
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
32-
node, err := GetNode(env)
33+
node, err := cmdenv.GetNode(env)
3334
if err != nil {
3435
res.SetError(err, cmdkit.ErrNormal)
3536
return

‎core/commands/env.go renamed to ‎core/commands/cmdenv/env.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package commands
1+
package cmdenv
22

33
import (
44
"fmt"

‎core/commands/dht.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ var findProvidersDhtCmd = &cmds.Command{
160160
}
161161

162162
if n.Routing == nil {
163-
res.SetError(errNotOnline, cmdkit.ErrNormal)
163+
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
164164
return
165165
}
166166

@@ -272,7 +272,7 @@ var provideRefDhtCmd = &cmds.Command{
272272
}
273273

274274
if n.Routing == nil {
275-
res.SetError(errNotOnline, cmdkit.ErrNormal)
275+
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
276276
return
277277
}
278278

@@ -424,7 +424,7 @@ var findPeerDhtCmd = &cmds.Command{
424424
}
425425

426426
if n.Routing == nil {
427-
res.SetError(errNotOnline, cmdkit.ErrNormal)
427+
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
428428
return
429429
}
430430

@@ -529,7 +529,7 @@ Different key types can specify other 'best' rules.
529529
}
530530

531531
if n.Routing == nil {
532-
res.SetError(errNotOnline, cmdkit.ErrNormal)
532+
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
533533
return
534534
}
535535

@@ -643,7 +643,7 @@ NOTE: A value may not exceed 2048 bytes.
643643
}
644644

645645
if n.Routing == nil {
646-
res.SetError(errNotOnline, cmdkit.ErrNormal)
646+
res.SetError(ErrNotOnline, cmdkit.ErrNormal)
647647
return
648648
}
649649

‎core/commands/dns.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
cmds "github.com/ipfs/go-ipfs/commands"
88
e "github.com/ipfs/go-ipfs/core/commands/e"
9+
ncmd "github.com/ipfs/go-ipfs/core/commands/name"
910
namesys "github.com/ipfs/go-ipfs/namesys"
1011
nsopts "github.com/ipfs/go-ipfs/namesys/opts"
1112

@@ -72,7 +73,7 @@ The resolver can recursively resolve:
7273
res.SetError(err, cmdkit.ErrNormal)
7374
return
7475
}
75-
res.SetOutput(&ResolvedPath{output})
76+
res.SetOutput(&ncmd.ResolvedPath{Path: output})
7677
},
7778
Marshalers: cmds.MarshalerMap{
7879
cmds.Text: func(res cmds.Response) (io.Reader, error) {
@@ -81,12 +82,12 @@ The resolver can recursively resolve:
8182
return nil, err
8283
}
8384

84-
output, ok := v.(*ResolvedPath)
85+
output, ok := v.(*ncmd.ResolvedPath)
8586
if !ok {
8687
return nil, e.TypeErr(output, v)
8788
}
8889
return strings.NewReader(output.Path.String() + "\n"), nil
8990
},
9091
},
91-
Type: ResolvedPath{},
92+
Type: ncmd.ResolvedPath{},
9293
}

‎core/commands/files.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
oldcmds "github.com/ipfs/go-ipfs/commands"
1515
lgc "github.com/ipfs/go-ipfs/commands/legacy"
1616
core "github.com/ipfs/go-ipfs/core"
17+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1718
e "github.com/ipfs/go-ipfs/core/commands/e"
1819
ft "gx/ipfs/QmQjEpRiwVvtowhq69dAtB4jhioPVFXiCcWZm9Sfgn7eqc/go-unixfs"
1920
uio "gx/ipfs/QmQjEpRiwVvtowhq69dAtB4jhioPVFXiCcWZm9Sfgn7eqc/go-unixfs/io"
@@ -114,7 +115,7 @@ var filesStatCmd = &cmds.Command{
114115
res.SetError(err, cmdkit.ErrClient)
115116
}
116117

117-
node, err := GetNode(env)
118+
node, err := cmdenv.GetNode(env)
118119
if err != nil {
119120
res.SetError(err, cmdkit.ErrNormal)
120121
return
@@ -745,7 +746,7 @@ stat' on the file or any of its ancestors.
745746
return
746747
}
747748

748-
nd, err := GetNode(env)
749+
nd, err := cmdenv.GetNode(env)
749750
if err != nil {
750751
re.SetError(err, cmdkit.ErrNormal)
751752
return

‎core/commands/filestore.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
oldCmds "github.com/ipfs/go-ipfs/commands"
1010
lgc "github.com/ipfs/go-ipfs/commands/legacy"
1111
"github.com/ipfs/go-ipfs/core"
12+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1213
e "github.com/ipfs/go-ipfs/core/commands/e"
1314
"github.com/ipfs/go-ipfs/filestore"
1415

@@ -231,7 +232,7 @@ var dupsFileStore = &oldCmds.Command{
231232
}
232233

233234
func getFilestore(env interface{}) (*core.IpfsNode, *filestore.Filestore, error) {
234-
n, err := GetNode(env)
235+
n, err := cmdenv.GetNode(env)
235236
if err != nil {
236237
return nil, nil, err
237238
}

‎core/commands/get.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ import (
1010
"strings"
1111

1212
core "github.com/ipfs/go-ipfs/core"
13+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
1314
e "github.com/ipfs/go-ipfs/core/commands/e"
14-
uarchive "gx/ipfs/QmQjEpRiwVvtowhq69dAtB4jhioPVFXiCcWZm9Sfgn7eqc/go-unixfs/archive"
15-
dag "gx/ipfs/QmRiQCJZ91B7VNmLvA6sxzDuBJGSojS3uXHHVuNr3iueNZ/go-merkledag"
16-
path "gx/ipfs/QmdMPBephdLYNESkruDX2hcDTgFYhoCt4LimWhgnomSdV2/go-path"
1715

1816
"gx/ipfs/QmPTfgFTo9PFr1PvPKyKoeMgBvYPh6cX3aDP7DHKVbnCbi/go-ipfs-cmds"
1917
"gx/ipfs/QmPtj12fdwuAqj9sBSTNUxBNu8kCGNp8b3o8yUzMm5GHpq/pb"
2018
tar "gx/ipfs/QmQine7gvHncNevKtG9QXxf3nXcwSj6aDDmMm52mHofEEp/tar-utils"
19+
uarchive "gx/ipfs/QmQjEpRiwVvtowhq69dAtB4jhioPVFXiCcWZm9Sfgn7eqc/go-unixfs/archive"
20+
dag "gx/ipfs/QmRiQCJZ91B7VNmLvA6sxzDuBJGSojS3uXHHVuNr3iueNZ/go-merkledag"
2121
"gx/ipfs/QmSP88ryZkHSRn1fnngAaV2Vcn63WUJzAavnRM9CVdU1Ky/go-ipfs-cmdkit"
22+
path "gx/ipfs/QmdMPBephdLYNESkruDX2hcDTgFYhoCt4LimWhgnomSdV2/go-path"
2223
)
2324

2425
var ErrInvalidCompressionLevel = errors.New("compression level must be between 1 and 9")
@@ -59,7 +60,7 @@ may also specify the level of compression by specifying '-l=<1-9>'.
5960
return
6061
}
6162

62-
node, err := GetNode(env)
63+
node, err := cmdenv.GetNode(env)
6364
if err != nil {
6465
res.SetError(err, cmdkit.ErrNormal)
6566
return

‎core/commands/keystore.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"io"
66
"text/tabwriter"
77

8+
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
89
"github.com/ipfs/go-ipfs/core/commands/e"
910
"github.com/ipfs/go-ipfs/core/coreapi/interface/options"
1011

@@ -66,7 +67,7 @@ var keyGenCmd = &cmds.Command{
6667
cmdkit.StringArg("name", true, false, "name of key to create"),
6768
},
6869
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
69-
api, err := GetApi(env)
70+
api, err := cmdenv.GetApi(env)
7071
if err != nil {
7172
res.SetError(err, cmdkit.ErrNormal)
7273
return
@@ -125,7 +126,7 @@ var keyListCmd = &cmds.Command{
125126
cmdkit.BoolOption("l", "Show extra information about keys."),
126127
},
127128
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
128-
api, err := GetApi(env)
129+
api, err := cmdenv.GetApi(env)
129130
if err != nil {
130131
res.SetError(err, cmdkit.ErrNormal)
131132
return
@@ -163,7 +164,7 @@ var keyRenameCmd = &cmds.Command{
163164
cmdkit.BoolOption("force", "f", "Allow to overwrite an existing key."),
164165
},
165166
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
166-
api, err := GetApi(env)
167+
api, err := cmdenv.GetApi(env)
167168
if err != nil {
168169
res.SetError(err, cmdkit.ErrNormal)
169170
return
@@ -215,7 +216,7 @@ var keyRmCmd = &cmds.Command{
215216
cmdkit.BoolOption("l", "Show extra information about keys."),
216217
},
217218
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) {
218-
api, err := GetApi(env)
219+
api, err := cmdenv.GetApi(env)
219220
if err != nil {
220221
res.SetError(err, cmdkit.ErrNormal)
221222
return

‎core/commands/mount_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ baz
9191

9292
// error if we aren't running node in online mode
9393
if node.LocalMode() {
94-
res.SetError(errNotOnline, cmdkit.ErrClient)
94+
res.SetError(ErrNotOnline, cmdkit.ErrClient)
9595
return
9696
}
9797

0 commit comments

Comments
 (0)