default add progress to false, unless using CLI
License: MIT Signed-off-by: Jeromy <why@ipfs.io>
Jeromy committed
Aug 1, 2016 at 08:52 UTC
1b50fcefed24805b3a84f068f555cbd38fb6ecf6
2 files changed
+7
-2
core/commands/add.go
+6
-1
@@ -68,7 +68,7 @@ You can now refer to the added file in a gateway, like so:
68
cmds.OptionRecursivePath, // a builtin option that allows recursive paths (-r, --recursive)
69
cmds.BoolOption(quietOptionName, "q", "Write minimal output.").Default(false),
70
cmds.BoolOption(silentOptionName, "Write no output.").Default(false),
71
- cmds.BoolOption(progressOptionName, "p", "Stream progress data.").Default(true),
71
+ cmds.BoolOption(progressOptionName, "p", "Stream progress data."),
72
cmds.BoolOption(trickleOptionName, "t", "Use trickle-dag format for dag generation.").Default(false),
73
cmds.BoolOption(onlyHashOptionName, "n", "Only chunk and hash - do not write to disk.").Default(false),
74
cmds.BoolOption(wrapOptionName, "w", "Wrap files with a directory object.").Default(false),
@@ -81,6 +81,11 @@ You can now refer to the added file in a gateway, like so:
81
return nil
82
}
83
84
+ _, found, _ := req.Option(progressOptionName).Bool()
85
+ if !found {
86
+ req.SetOption(progressOptionName, true)
87
+ }
88
+
89
sizeFile, ok := req.Files().(files.SizeFile)
90
if !ok {
91
// we don't need to error, the progress bar just won't know how big the files are
test/sharness/t0040-add-and-cat.sh
+1
-1
@@ -343,7 +343,7 @@ test_add_cat_5MB
343
344
test_add_cat_expensive
345
346
-test_add_named_pipe " Post http://$API_ADDR/api/v0/add?encoding=json&r=true&stream-channels=true:"
346
+test_add_named_pipe " Post http://$API_ADDR/api/v0/add?encoding=json&progress=true&r=true&stream-channels=true:"
347
348
test_kill_ipfs_daemon
349