From 8f8a17cf1855d809bf3655a3e4e9351b3850d3f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 Sep 2016 14:26:34 -0400 Subject: Remove key:null from git-annex add --json output. --- Messages/JSON.hs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Messages') diff --git a/Messages/JSON.hs b/Messages/JSON.hs index 9f8f31c46..0cceda3f3 100644 --- a/Messages/JSON.hs +++ b/Messages/JSON.hs @@ -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' ] -- cgit v1.2.3