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

Make --json-progress output be shown even when the size of a object is not known.

Browse source
This commit is contained in:
Joey Hess 2016-09-29 16:59:48 -04:00
parent 7cd6a6a39c
commit 28c6209f55
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Messages/JSON.hs
View file

@ -95,17 +95,20 @@ complete v _ = add v (Just (HM.empty, True))
-- Show JSON formatted progress, including the current state of the JSON
-- object for the action being performed.
progress :: Maybe Object -> Integer -> BytesProcessed -> IO ()
progress maction size bytesprocessed = emit $ case maction of
progress :: Maybe Object -> Maybe Integer -> BytesProcessed -> IO ()
progress maction msize bytesprocessed = emit $ case maction of
Just action -> HM.insert "action" (Object action) o
Nothing -> o
where
n = fromBytesProcessed bytesprocessed :: Integer
Object o = object
[ "byte-progress" .= n
, "percent-progress" .= showPercentage 2 (percentage size n)
, "total-size" .= size
]
Object o = case msize of
Just size -> object
[ "byte-progress" .= n
, "percent-progress" .= showPercentage 2 (percentage size n)
, "total-size" .= size
]
Nothing -> object
[ "byte-progress" .= n ]
-- A value that can be displayed either normally, or as JSON.
data DualDisp = DualDisp