diff options
author | Joey Hess <joeyh@joeyh.name> | 2016-09-29 16:59:48 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2016-09-29 16:59:48 -0400 |
commit | 08796570e27924179abda72988e243726b8b5565 (patch) | |
tree | 9bf9062e393000e690a050e2a975e8f15a8fb7ff /Messages/JSON.hs | |
parent | 07347cca3dd9ed015bd35239ccdf0f5df8f2d746 (diff) |
Make --json-progress output be shown even when the size of a object is not known.
Diffstat (limited to 'Messages/JSON.hs')
-rw-r--r-- | Messages/JSON.hs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Messages/JSON.hs b/Messages/JSON.hs index fb288b735..06bdd9a4d 100644 --- a/Messages/JSON.hs +++ b/Messages/JSON.hs @@ -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 |