diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-09 15:06:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-09 15:06:54 -0400 |
| commit | 2408f5c6084aa04a09b36edcd264ce6bc7177c93 (patch) | |
| tree | c745dce52ab6510948402eb1585b13718b39da3e /CmdLine/GitAnnex | |
| parent | 8f8a17cf1855d809bf3655a3e4e9351b3850d3f2 (diff) | |
addurl, get: Added --json-progress option, which adds progress objects to the json output.
This doesn't work right when used with -J yet, and there is some really
ugly hand-crafting of part of the json output.
Diffstat (limited to 'CmdLine/GitAnnex')
| -rw-r--r-- | CmdLine/GitAnnex/Options.hs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs index 1c360de19..92724d03d 100644 --- a/CmdLine/GitAnnex/Options.hs +++ b/CmdLine/GitAnnex/Options.hs @@ -286,12 +286,19 @@ combiningOptions = shortopt o h = globalFlag (Limit.addToken [o]) ( short o <> help h <> hidden ) jsonOption :: GlobalOption -jsonOption = globalFlag (Annex.setOutput JSONOutput) +jsonOption = globalFlag (Annex.setOutput (JSONOutput False)) ( long "json" <> short 'j' <> help "enable JSON output" <> hidden ) +jsonProgressOption :: GlobalOption +jsonProgressOption = globalFlag (Annex.setOutput (JSONOutput True)) + ( long "json-progress" <> short 'j' + <> help "include progress in JSON output" + <> hidden + ) + -- Note that a command that adds this option should wrap its seek -- action in `allowConcurrentOutput`. jobsOption :: GlobalOption |