commands: use EmitOnce for single object
License: MIT Signed-off-by: Overbool <overbool.xu@gmail.com>
Overbool committed
Oct 31, 2018 at 10:10 UTC
2c48466630e58043869f9a9fd91ab5c66d23e7e4
8 files changed
+27
-21
core/commands/active.go
+2
-2
@@ -9,7 +9,7 @@ import (
9
10
oldcmds "github.com/ipfs/go-ipfs/commands"
11
12
- cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds"
12
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
13
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
14
)
15
@@ -26,7 +26,7 @@ Lists running and recently run commands.
26
},
27
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
28
ctx := env.(*oldcmds.Context)
29
- return res.Emit(ctx.ReqLog.Report())
29
+ return cmds.EmitOnce(res, ctx.ReqLog.Report())
30
},
31
Options: []cmdkit.Option{
32
cmdkit.BoolOption("verbose", verboseOptionName, "Print extra information."),
core/commands/config.go
+3
-3
@@ -14,8 +14,8 @@ import (
14
repo "github.com/ipfs/go-ipfs/repo"
15
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
16
17
- cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds"
17
"gx/ipfs/QmP2i47tnU23ijdshrZtuvrSkQPtf9HhsMb9fwGVe8owj2/jsondiff"
18
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
19
config "gx/ipfs/QmbK4EmM2Xx5fmbqK38TGP3PpY66r3tkXLZTcc7dF9mFwM/go-ipfs-config"
20
"gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
21
)
@@ -167,7 +167,7 @@ NOTE: For security reasons, this command will omit your private key. If you woul
167
return err
168
}
169
170
- return res.Emit(&cfg)
170
+ return cmds.EmitOnce(res, &cfg)
171
},
172
Encoders: cmds.EncoderMap{
173
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *map[string]interface{}) error {
@@ -319,7 +319,7 @@ var configProfileApplyCmd = &cmds.Command{
319
return err
320
}
321
322
- return res.Emit(&ConfigUpdateOutput{
322
+ return cmds.EmitOnce(res, &ConfigUpdateOutput{
323
OldCfg: oldCfgMap,
324
NewCfg: newCfgMap,
325
})
core/commands/diag.go
+1
-1
@@ -1,7 +1,7 @@
1
package commands
2
3
import (
4
- cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds"
4
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
5
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
6
)
7
core/commands/log.go
+4
-3
@@ -4,7 +4,7 @@ import (
4
"fmt"
5
"io"
6
7
- cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds"
7
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
8
logging "gx/ipfs/QmcuXC5cxs79ro2cUuHs4HQ2bkDLJUYokwL8aivcX6HW3C/go-log"
9
lwriter "gx/ipfs/QmcuXC5cxs79ro2cUuHs4HQ2bkDLJUYokwL8aivcX6HW3C/go-log/writer"
10
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
@@ -63,7 +63,8 @@ the event log.
63
64
s := fmt.Sprintf("Changed log level of '%s' to '%s'\n", subsystem, level)
65
log.Info(s)
66
- return res.Emit(&MessageOutput{s})
66
+
67
+ return cmds.EmitOnce(res, &MessageOutput{s})
68
},
69
Encoders: cmds.EncoderMap{
70
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *MessageOutput) error {
@@ -83,7 +84,7 @@ subsystems of a running daemon.
84
`,
85
},
86
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
86
- return res.Emit(&stringList{logging.GetSubsystems()})
87
+ return cmds.EmitOnce(res, &stringList{logging.GetSubsystems()})
88
},
89
Encoders: cmds.EncoderMap{
90
cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, list *stringList) error {
core/commands/mount_nofuse.go
+1
-1
@@ -3,7 +3,7 @@
3
package commands
4
5
import (
6
- cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds"
6
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
7
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
8
)
9
core/commands/mount_unix.go
+12
-7
@@ -9,9 +9,14 @@ import (
9
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10
nodeMount "github.com/ipfs/go-ipfs/fuse/node"
11
12
- config "gx/ipfs/QmPEpj17FDRpc7K1aArKZp3RsHtzRMKykeK9GVgn4WQGPR/go-ipfs-config"
12
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
13
config "gx/ipfs/QmbK4EmM2Xx5fmbqK38TGP3PpY66r3tkXLZTcc7dF9mFwM/go-ipfs-config"
14
- "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
14
+ cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
15
+)
16
+
17
+const (
18
+ mountIPFSPathOptionName = "ipfs-path"
19
+ mountIPNSPathOptionName = "ipns-path"
20
)
21
22
var MountCmd = &cmds.Command{
@@ -72,8 +77,8 @@ baz
77
`,
78
},
79
Options: []cmdkit.Option{
75
- cmdkit.StringOption("ipfs-path", "f", "The path where IPFS should be mounted."),
76
- cmdkit.StringOption("ipns-path", "n", "The path where IPNS should be mounted."),
80
+ cmdkit.StringOption(mountIPFSPathOptionName, "f", "The path where IPFS should be mounted."),
81
+ cmdkit.StringOption(mountIPNSPathOptionName, "n", "The path where IPNS should be mounted."),
82
},
83
Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error {
84
cfg, err := cmdenv.GetConfig(env)
@@ -91,13 +96,13 @@ baz
96
return err
97
}
98
94
- fsdir, found := req.Options["f"].(string)
99
+ fsdir, found := req.Options[mountIPFSPathOptionName].(string)
100
if !found {
101
fsdir = cfg.Mounts.IPFS // use default value
102
}
103
104
// get default mount points
100
- nsdir, found := req.Options["n"].(string)
105
+ nsdir, found := req.Options[mountIPNSPathOptionName].(string)
106
if !found {
107
nsdir = cfg.Mounts.IPNS // NB: be sure to not redeclare!
108
}
@@ -110,7 +115,7 @@ baz
115
var output config.Mounts
116
output.IPFS = fsdir
117
output.IPNS = nsdir
113
- return res.Emit(&output)
118
+ return cmds.EmitOnce(res, &output)
119
},
120
Type: config.Mounts{},
121
Encoders: cmds.EncoderMap{
core/commands/mount_windows.go
+1
-1
@@ -3,7 +3,7 @@ package commands
3
import (
4
"errors"
5
6
- cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds"
6
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
7
cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
8
)
9
core/commands/sysdiag.go
+3
-3
@@ -8,10 +8,10 @@ import (
8
version "github.com/ipfs/go-ipfs"
9
cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv"
10
11
- cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds"
11
manet "gx/ipfs/QmQVUtnrNGtCRkCMpXgpApfzQjc8FDaDVxHqWH8cnZQeh5/go-multiaddr-net"
12
sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo"
14
- "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
13
+ cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds"
14
+ cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit"
15
)
16
17
var sysDiagCmd = &cmds.Command{
@@ -54,7 +54,7 @@ Prints out information about your computer to aid in easier debugging.
54
55
info["ipfs_version"] = version.CurrentVersionNumber
56
info["ipfs_commit"] = version.CurrentCommit
57
- return res.Emit(info)
57
+ return cmds.EmitOnce(res, info)
58
},
59
}
60