core/commands/pin: implement --count for 'ipfs pin ls'

chriscool · chriscool · commit 636c45d46470 · 2016-01-22T18:06:49.000+01:00
License: MIT
Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
diff --git a/core/commands/pin.go b/core/commands/pin.go
@@ -248,16 +248,25 @@ Example:
 				return nil, err
 			}
 
+			count, _, err := res.Request().Option("count").Bool()
+			if err != nil {
+				return nil, err
+			}
+
 			keys, ok := res.Output().(*RefKeyList)
 			if !ok {
 				return nil, u.ErrCast()
 			}
 			out := new(bytes.Buffer)
-			for k, v := range keys.Keys {
-				if quiet {
-					fmt.Fprintf(out, "%s\n", k)
-				} else {
-					fmt.Fprintf(out, "%s %s\n", k, v.Type)
+			if count {
+				fmt.Fprintf(out, "%d\n", len(keys.Keys))
+			} else {
+				for k, v := range keys.Keys {
+					if quiet {
+						fmt.Fprintf(out, "%s\n", k)
+					} else {
+						fmt.Fprintf(out, "%s %s\n", k, v.Type)
+					}
 				}
 			}
 			return out, nil
diff --git a/test/sharness/t0081-repo-pinning.sh b/test/sharness/t0081-repo-pinning.sh
@@ -119,11 +119,22 @@ test_expect_success "ipfs object links $HASH_DIR1 works" '
 	ipfs object links $HASH_DIR1 > DIR1_objlink
 '
 
-
 test_expect_success "added dir was pinned recursively" '
 	test_pin_flag $HASH_DIR1 recursive true
 '
 
+test_expect_success "'ipfs pin ls --count' works" '
+	ipfs pin ls --count --type=all >actual_all &&
+	ipfs pin ls --count --type=recursive >actual_recursive
+'
+
+test_expect_success "'ipfs pin ls --count' output looks good" '
+	echo "18" >expected_all &&
+	echo "3" >expected_recursive &&
+	test_cmp expected_all actual_all &&
+	test_cmp expected_recursive actual_recursive
+'
+
 test_expect_success "rest were pinned indirectly" '
 	test_pin_flag "$HASH_FILE6" indirect true
 	test_pin_flag "$HASH_FILE5" indirect true
