cleanup a bit, and add to 'get'

whyrusleeping · whyrusleeping · commit 10885ce82265 · 2016-02-10T10:11:04.000-08:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/commands/cat.go b/core/commands/cat.go
@@ -31,7 +31,7 @@ it contains.
 	PreRun: func(req cmds.Request) error {
 		verbose, _, _ := req.Option("verbose").Bool()
 		if verbose {
-			return PrintDebugLog(req)
+			return PrintDebugLog(req, req.Arguments()[0])
 		}
 		return nil
 	},
diff --git a/core/commands/debug.go b/core/commands/debug.go
@@ -11,6 +11,7 @@ import (
 	path "github.com/ipfs/go-ipfs/path"
 	fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
 
+	"golang.org/x/net/context"
 	ma "gx/ipfs/QmR3JkmZBKYXgNMNsNZawm914455Qof3PEopwuVSeXG7aV/go-multiaddr"
 	manet "gx/ipfs/QmYtzQmUwPFGxjCXctJ8e6GXS8sYfoXy2pdeMbS5SFWqRi/go-multiaddr-net"
 )
@@ -36,11 +37,17 @@ func GetEventStream(req cmds.Request) (<-chan map[string]interface{}, error) {
 		return nil, err
 	}
 
+	events := parseJsonStream(req.Context(), resp.Body)
+
+	return events, nil
+}
+
+func parseJsonStream(ctx context.Context, r io.ReadCloser) chan map[string]interface{} {
 	events := make(chan map[string]interface{})
 	go func() {
-		defer resp.Body.Close()
+		defer r.Close()
 
-		dec := json.NewDecoder(resp.Body)
+		dec := json.NewDecoder(r)
 		for {
 			var obj map[string]interface{}
 			err := dec.Decode(&obj)
@@ -53,16 +60,16 @@ func GetEventStream(req cmds.Request) (<-chan map[string]interface{}, error) {
 
 			select {
 			case events <- obj:
-			case <-req.Context().Done():
+			case <-ctx.Done():
 				return
 			}
 		}
 	}()
 
-	return events, nil
+	return events
 }
 
-func PrintDebugLog(req cmds.Request) error {
+func PrintDebugLog(req cmds.Request, targetstr string) error {
 	events, err := GetEventStream(req)
 	if err != nil {
 		return err
@@ -72,7 +79,7 @@ func PrintDebugLog(req cmds.Request) error {
 		fmt.Fprintf(os.Stderr, f+"\n", args...)
 	}
 
-	p, err := path.ParsePath(req.Arguments()[0])
+	p, err := path.ParsePath(targetstr)
 	if err != nil {
 		return err
 	}
diff --git a/core/commands/get.go b/core/commands/get.go
@@ -44,10 +44,20 @@ may also specify the level of compression by specifying '-l=<1-9>'.
 		cmds.BoolOption("archive", "a", "Output a TAR archive."),
 		cmds.BoolOption("compress", "C", "Compress the output with GZIP compression."),
 		cmds.IntOption("compression-level", "l", "The level of compression (1-9)."),
+		cmds.BoolOption("verbose", "v", "enable verbose debug output"),
 	},
 	PreRun: func(req cmds.Request) error {
 		_, err := getCompressOptions(req)
-		return err
+		if err != nil {
+			return err
+		}
+
+		verbose, _, _ := req.Option("verbose").Bool()
+		if verbose {
+			return PrintDebugLog(req, req.Arguments()[0])
+		}
+
+		return nil
 	},
 	Run: func(req cmds.Request, res cmds.Response) {
 		cmplvl, err := getCompressOptions(req)

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ it contains.`
`31`	`31`	`PreRun: func(req cmds.Request) error {`
`32`	`32`	`verbose, _, _ := req.Option("verbose").Bool()`
`33`	`33`	`if verbose {`
`34`		`- return PrintDebugLog(req)`
	`34`	`+ return PrintDebugLog(req, req.Arguments()[0])`
`35`	`35`	`}`
`36`	`36`	`return nil`
`37`	`37`	`},`