mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

addurl, get: Added --json-progress option, which adds progress objects to the json output.

Browse source 
This doesn't work right when used with -J yet, and there is some really
ugly hand-crafting of part of the json output.
This commit is contained in:
Joey Hess 2016-09-09 15:06:54 -04:00
parent f421a7f001
commit 05d4438383
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
12 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CmdLine/GitAnnex/Options.hs
View file

@ -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