From d26f97a90293bfea1db208eb3f7d8077297311c2 Mon Sep 17 00:00:00 2001 From: Overbool Date: Sat, 27 Oct 2018 00:55:03 +0800 Subject: [PATCH] fix(cmd/diag): inorder output License: MIT Signed-off-by: Overbool --- core/commands/active.go | 16 ++++++++++++---- core/commands/diag.go | 2 +- core/commands/mount_nofuse.go | 2 +- core/commands/mount_windows.go | 6 +++--- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/core/commands/active.go b/core/commands/active.go index fffdc4f60..4fada6f13 100644 --- a/core/commands/active.go +++ b/core/commands/active.go @@ -1,6 +1,7 @@ package commands import ( + "bytes" "fmt" "io" "sort" @@ -8,7 +9,8 @@ import ( "time" oldcmds "github.com/ipfs/go-ipfs/commands" - cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds" + + cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) @@ -38,7 +40,9 @@ Lists running and recently run commands. cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *[]*cmds.ReqLogEntry) error { verbose, _ := req.Options[verboseOptionName].(bool) - tw := tabwriter.NewWriter(w, 4, 4, 2, ' ', 0) + buf := new(bytes.Buffer) + + tw := tabwriter.NewWriter(buf, 4, 4, 2, ' ', 0) if verbose { fmt.Fprint(tw, "ID\t") } @@ -74,9 +78,13 @@ Lists running and recently run commands. live = req.EndTime.Sub(req.StartTime) } t := req.StartTime.Format(time.Stamp) - fmt.Fprintf(w, "%t\t%s\t%s\n", req.Active, t, live) + fmt.Fprintf(tw, "%t\t%s\t%s\n", req.Active, t, live) } - return tw.Flush() + tw.Flush() + + fmt.Fprint(w, buf) + + return nil }), }, Type: []*cmds.ReqLogEntry{}, diff --git a/core/commands/diag.go b/core/commands/diag.go index f6f14b839..b456b1f08 100644 --- a/core/commands/diag.go +++ b/core/commands/diag.go @@ -1,7 +1,7 @@ package commands import ( - cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds" + cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) diff --git a/core/commands/mount_nofuse.go b/core/commands/mount_nofuse.go index 8b21729c7..db31b91d7 100644 --- a/core/commands/mount_nofuse.go +++ b/core/commands/mount_nofuse.go @@ -3,7 +3,7 @@ package commands import ( - cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds" + cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) diff --git a/core/commands/mount_windows.go b/core/commands/mount_windows.go index 1840dea1c..3f99e86e1 100644 --- a/core/commands/mount_windows.go +++ b/core/commands/mount_windows.go @@ -3,7 +3,7 @@ package commands import ( "errors" - cmds "gx/ipfs/QmRRovo1DE6i5cMjCbf19mQCSuszF6SKwdZNUMS7MtBnH1/go-ipfs-cmds" + cmds "gx/ipfs/QmdTmGruUz23vgzym3uWpnAEQdGdGifQqBvP8UXSRjG8gZ/go-ipfs-cmds" cmdkit "gx/ipfs/Qmde5VP1qUkyQXKCfmEUA7bP64V2HAptbJ7phuPp7jXWwg/go-ipfs-cmdkit" ) @@ -13,7 +13,7 @@ var MountCmd = &cmds.Command{ ShortDescription: "Not yet implemented on Windows. :(", }, - Run: func(req cmds.Request, res cmds.Response) { - res.SetError(errors.New("Mount isn't compatible with Windows yet"), cmdkit.ErrNormal) + Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { + return errors.New("Mount isn't compatible with Windows yet") }, }