From 01dcf34a92ce8e5d0c0c6d18e13f46759dbdc379 Mon Sep 17 00:00:00 2001 From: Overbool Date: Wed, 31 Oct 2018 10:10:23 +0800 Subject: [PATCH] commands: use EmitOnce for single object License: MIT Signed-off-by: Overbool --- core/commands/active.go | 4 ++-- core/commands/config.go | 6 +++--- core/commands/diag.go | 2 +- core/commands/log.go | 7 ++++--- core/commands/mount_nofuse.go | 2 +- core/commands/mount_unix.go | 19 ++++++++++++------- core/commands/mount_windows.go | 2 +- core/commands/sysdiag.go | 6 +++--- 8 files changed, 27 insertions(+), 21 deletions(-) diff --git a/core/commands/active.go b/core/commands/active.go index 21e4b9c32bc4..a9913820e950 100644 --- a/core/commands/active.go +++ b/core/commands/active.go @@ -9,7 +9,7 @@ import ( oldcmds "github.com/ipfs/go-ipfs/commands" - cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) @@ -26,7 +26,7 @@ Lists running and recently run commands. }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { ctx := env.(*oldcmds.Context) - return res.Emit(ctx.ReqLog.Report()) + return cmds.EmitOnce(res, ctx.ReqLog.Report()) }, Options: []cmdkit.Option{ cmdkit.BoolOption("verbose", verboseOptionName, "Print extra information."), diff --git a/core/commands/config.go b/core/commands/config.go index b495b8620146..0bd957004400 100644 --- a/core/commands/config.go +++ b/core/commands/config.go @@ -14,8 +14,8 @@ import ( repo "github.com/ipfs/go-ipfs/repo" fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo" - cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds" "gx/ipfs/QmP2i47tnU23ijdshrZtuvrSkQPtf9HhsMb9fwGVe8owj2/jsondiff" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" config "gx/ipfs/QmbK4EmM2Xx5fmbqK38TGP3PpY66r3tkXLZTcc7dF9mFwM/go-ipfs-config" "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) @@ -167,7 +167,7 @@ NOTE: For security reasons, this command will omit your private key. If you woul return err } - return res.Emit(&cfg) + return cmds.EmitOnce(res, &cfg) }, Encoders: cmds.EncoderMap{ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *map[string]interface{}) error { @@ -319,7 +319,7 @@ var configProfileApplyCmd = &cmds.Command{ return err } - return res.Emit(&ConfigUpdateOutput{ + return cmds.EmitOnce(res, &ConfigUpdateOutput{ OldCfg: oldCfgMap, NewCfg: newCfgMap, }) diff --git a/core/commands/diag.go b/core/commands/diag.go index 6b9a44ec8a86..2b760d0bc3db 100644 --- a/core/commands/diag.go +++ b/core/commands/diag.go @@ -1,7 +1,7 @@ package commands import ( - cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) diff --git a/core/commands/log.go b/core/commands/log.go index 2434c007bae6..28106991c81e 100644 --- a/core/commands/log.go +++ b/core/commands/log.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" logging "gx/ipfs/QmcuXC5cxs79ro2cUuHs4HQ2bkDLJUYokwL8aivcX6HW3C/go-log" lwriter "gx/ipfs/QmcuXC5cxs79ro2cUuHs4HQ2bkDLJUYokwL8aivcX6HW3C/go-log/writer" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" @@ -63,7 +63,8 @@ the event log. s := fmt.Sprintf("Changed log level of '%s' to '%s'\n", subsystem, level) log.Info(s) - return res.Emit(&MessageOutput{s}) + + return cmds.EmitOnce(res, &MessageOutput{s}) }, Encoders: cmds.EncoderMap{ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *MessageOutput) error { @@ -83,7 +84,7 @@ subsystems of a running daemon. `, }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { - return res.Emit(&stringList{logging.GetSubsystems()}) + return cmds.EmitOnce(res, &stringList{logging.GetSubsystems()}) }, Encoders: cmds.EncoderMap{ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, list *stringList) error { diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go index cd93ac319b25..84122467c1e2 100644 --- a/core/commands/mount_nofuse.go +++ b/core/commands/mount_nofuse.go @@ -3,7 +3,7 @@ package commands import ( - cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) diff --git a/core/commands/mount_unix.go b/core/commands/mount_unix.go index a20ea29dc069..64e3d3de68f5 100644 --- a/core/commands/mount_unix.go +++ b/core/commands/mount_unix.go @@ -9,9 +9,14 @@ import ( cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" nodeMount "github.com/ipfs/go-ipfs/fuse/node" - config "gx/ipfs/QmPEpj17FDRpc7K1aArKZp3RsHtzRMKykeK9GVgn4WQGPR/go-ipfs-config" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" config "gx/ipfs/QmbK4EmM2Xx5fmbqK38TGP3PpY66r3tkXLZTcc7dF9mFwM/go-ipfs-config" - "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" + cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" +) + +const ( + mountIPFSPathOptionName = "ipfs-path" + mountIPNSPathOptionName = "ipns-path" ) var MountCmd = &cmds.Command{ @@ -72,8 +77,8 @@ baz `, }, Options: []cmdkit.Option{ - cmdkit.StringOption("ipfs-path", "f", "The path where IPFS should be mounted."), - cmdkit.StringOption("ipns-path", "n", "The path where IPNS should be mounted."), + cmdkit.StringOption(mountIPFSPathOptionName, "f", "The path where IPFS should be mounted."), + cmdkit.StringOption(mountIPNSPathOptionName, "n", "The path where IPNS should be mounted."), }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { cfg, err := cmdenv.GetConfig(env) @@ -91,13 +96,13 @@ baz return err } - fsdir, found := req.Options["f"].(string) + fsdir, found := req.Options[mountIPFSPathOptionName].(string) if !found { fsdir = cfg.Mounts.IPFS // use default value } // get default mount points - nsdir, found := req.Options["n"].(string) + nsdir, found := req.Options[mountIPNSPathOptionName].(string) if !found { nsdir = cfg.Mounts.IPNS // NB: be sure to not redeclare! } @@ -110,7 +115,7 @@ baz var output config.Mounts output.IPFS = fsdir output.IPNS = nsdir - return res.Emit(&output) + return cmds.EmitOnce(res, &output) }, Type: config.Mounts{}, Encoders: cmds.EncoderMap{ diff --git a/core/commands/mount_windows.go b/core/commands/mount_windows.go index 07b1a42a8fbc..36b408d627f1 100644 --- a/core/commands/mount_windows.go +++ b/core/commands/mount_windows.go @@ -3,7 +3,7 @@ package commands import ( "errors" - cmds "gx/ipfs/QmSXUokcP4TJpFfqozT69AVAYRtzXVMUjzQVkYX41R9Svs/go-ipfs-cmds" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go index 05faf700e120..8d5ad041f6de 100644 --- a/core/commands/sysdiag.go +++ b/core/commands/sysdiag.go @@ -8,10 +8,10 @@ import ( version "github.com/ipfs/go-ipfs" cmdenv "github.com/ipfs/go-ipfs/core/commands/cmdenv" - cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds" manet "gx/ipfs/QmQVUtnrNGtCRkCMpXgpApfzQjc8FDaDVxHqWH8cnZQeh5/go-multiaddr-net" sysi "gx/ipfs/QmZRjKbHa6DenStpQJFiaPcEwkZqrx7TH6xTf342LDU3qM/go-sysinfo" - "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" + cmds "gx/ipfs/Qma6uuSyjkecGhMFFLfzyJDPyoDtNJSHJNweDccZhaWkgU/go-ipfs-cmds" + cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) var sysDiagCmd = &cmds.Command{ @@ -54,7 +54,7 @@ Prints out information about your computer to aid in easier debugging. info["ipfs_version"] = version.CurrentVersionNumber info["ipfs_commit"] = version.CurrentCommit - return res.Emit(info) + return cmds.EmitOnce(res, info) }, }