diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2018-02-16 13:27:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-16 13:27:17 -0400 |
| commit | 6905149580cca206101dbdbcc88cc8a1d21a4088 (patch) | |
| tree | 2d70596e8fed37c829ec5bfb5baacf6d46462691 /Messages/JSON.hs | |
| parent | 6da003b9b7541e269e50add175be15b63009aa79 (diff) | |
--json: multi-line notes
--json: When there are multiple lines of notes about a file, make the note
field multiline, rather than the old behavior of only including the last
line.
Using newlines in the note is perhaps not ideal, but upgrading it to an
array in this case would be an annoying inconsistency to need to deal with.
This commit was sponsored by Ole-Morten Duesund on Patreon.
Diffstat (limited to 'Messages/JSON.hs')
| -rw-r--r-- | Messages/JSON.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Messages/JSON.hs b/Messages/JSON.hs index 6ca3c1383..9b9ca67cf 100644 --- a/Messages/JSON.hs +++ b/Messages/JSON.hs @@ -75,8 +75,12 @@ end b (Just (o, _)) = Just (HM.insert "success" (toJSON b) o, True) end _ Nothing = Nothing note :: String -> JSONBuilder -note s (Just (o, e)) = Just (HM.insert "note" (toJSON s) o, e) note _ Nothing = Nothing +note s (Just (o, e)) = Just (HM.insertWith combinelines "note" (toJSON s) o, e) + where + combinelines (String new) (String old) = + String (old <> T.pack "\n" <> new) + combinelines new _old = new info :: String -> JSONBuilder info s _ = Just (o, True) |