Remove key:null from git-annex add --json output.

This commit is contained in:
Joey Hess 2016-09-09 14:26:34 -04:00
parent 4a09b4bbbd
commit f421a7f001
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 8 additions and 4 deletions

View file

@ -24,6 +24,7 @@ import qualified Data.Map as M
import qualified Data.Text as T
import qualified Data.ByteString.Lazy as B
import System.IO
import Data.Maybe
import Data.Monoid
import Prelude
@ -84,10 +85,12 @@ data JSONActionItem a = JSONActionItem
deriving (Show)
instance ToJSON (JSONActionItem a) where
toJSON i = object
[ "command" .= itemCommand i
, "key" .= (toJSON (itemKey i))
, "file" .= itemFile i
toJSON i = object $ catMaybes
[ Just $ "command" .= itemCommand i
, case itemKey i of
Nothing -> Nothing
Just k -> Just $ "key" .= toJSON k
, Just $ "file" .= itemFile i
-- itemAdded is not included; must be added later by 'add'
]