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 /Command | |
| 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 'Command')
| -rw-r--r-- | Command/AddUrl.hs | 2 | ||||
| -rw-r--r-- | Command/Get.hs | 2 | ||||
| -rw-r--r-- | Command/MetaData.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index be29cc228..3a6ee7560 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -31,7 +31,7 @@ import Annex.Quvi import qualified Utility.Quvi as Quvi cmd :: Command -cmd = notBareRepo $ withGlobalOptions [jobsOption, jsonOption] $ +cmd = notBareRepo $ withGlobalOptions [jobsOption, jsonOption, jsonProgressOption] $ command "addurl" SectionCommon "add urls to annex" (paramRepeating paramUrl) (seek <$$> optParser) diff --git a/Command/Get.hs b/Command/Get.hs index 70b877065..a0c7aff47 100644 --- a/Command/Get.hs +++ b/Command/Get.hs @@ -16,7 +16,7 @@ import Annex.Wanted import qualified Command.Move cmd :: Command -cmd = withGlobalOptions (jobsOption : jsonOption : annexedMatchingOptions) $ +cmd = withGlobalOptions (jobsOption : jsonOption : jsonProgressOption : annexedMatchingOptions) $ command "get" SectionCommon "make content of annexed files available" paramPaths (seek <$$> optParser) diff --git a/Command/MetaData.hs b/Command/MetaData.hs index bf71f7b4f..6e64207c8 100644 --- a/Command/MetaData.hs +++ b/Command/MetaData.hs @@ -79,7 +79,7 @@ seek o = do (seeker $ whenAnnexed $ start now o) (forFiles o) Batch -> withMessageState $ \s -> case outputType s of - JSONOutput -> batchInput parseJSONInput $ + JSONOutput _ -> batchInput parseJSONInput $ commandAction . startBatch now _ -> error "--batch is currently only supported in --json mode" |