acf74ae945
Before, the json contained file:key; change that to key: If a file and a key are given, inclue both file: and key:
56 lines
1.1 KiB
Haskell
56 lines
1.1 KiB
Haskell
{- git-annex JSON output
|
|
-
|
|
- Copyright 2011 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Messages.JSON (
|
|
start,
|
|
end,
|
|
note,
|
|
add,
|
|
complete,
|
|
DualDisp(..),
|
|
) where
|
|
|
|
import Text.JSON
|
|
|
|
import qualified Utility.JSONStream as Stream
|
|
import Types.Key
|
|
import Data.Maybe
|
|
|
|
start :: String -> Maybe FilePath -> Maybe Key -> IO ()
|
|
start command file key = putStr $ Stream.start $ catMaybes
|
|
[ part "command" (Just command)
|
|
, part "file" file
|
|
, part "key" (fmap key2file key)
|
|
]
|
|
where
|
|
part _ Nothing = Nothing
|
|
part l (Just v) = Just (l, v)
|
|
|
|
end :: Bool -> IO ()
|
|
end b = putStr $ Stream.add [("success", b)] ++ Stream.end
|
|
|
|
note :: String -> IO ()
|
|
note s = add [("note", s)]
|
|
|
|
add :: JSON a => [(String, a)] -> IO ()
|
|
add v = putStr $ Stream.add v
|
|
|
|
complete :: JSON a => [(String, a)] -> IO ()
|
|
complete v = putStr $ Stream.start v ++ Stream.end
|
|
|
|
-- A value that can be displayed either normally, or as JSON.
|
|
data DualDisp = DualDisp
|
|
{ dispNormal :: String
|
|
, dispJson :: String
|
|
}
|
|
|
|
instance JSON DualDisp where
|
|
showJSON = JSString . toJSString . dispJson
|
|
readJSON _ = Error "stub"
|
|
|
|
instance Show DualDisp where
|
|
show = dispNormal
|