diff options
| author | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2021-09-30 15:18:50 +0300 |
|---|---|---|
| committer | Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> | 2021-10-17 12:03:40 +0300 |
| commit | 14059f65a43f865cf8e4a23566fdd7a144de0136 (patch) | |
| tree | 931cb7fa635b318f9ded71115a8ddf26e8694c84 | |
| parent | a20812af94669cb07d6ee92cbab37e751615b3eb (diff) | |
mu-find: unbreak json output
Fixes: #2149
Needs backporting to 1.6.x
| -rw-r--r-- | mu/mu-cmd-find.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mu/mu-cmd-find.cc b/mu/mu-cmd-find.cc index e56a688..b9c1e47 100644 --- a/mu/mu-cmd-find.cc +++ b/mu/mu-cmd-find.cc @@ -1,5 +1,5 @@ /* -** Copyright (C) 2008-2020 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> +** Copyright (C) 2008-2021 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** ** This program is free software; you can redistribute it and/or modify it ** under the terms of the GNU General Public License as published by the @@ -47,6 +47,7 @@ struct OutputInfo{ Xapian::docid docid{}; bool header{}; bool footer{}; + bool last{}; Option<QueryMatch&> match_info; }; @@ -522,8 +523,8 @@ output_json (MuMsg *msg, const OutputInfo& info, const MuConfig *opts, GError ** return true; } - g_print("%s\n", msg_to_sexp(msg, info.docid, MU_MSG_OPTION_HEADERS_ONLY) - .to_sexp_string().c_str()); + g_print("%s%s\n", msg_to_sexp(msg, info.docid, MU_MSG_OPTION_HEADERS_ONLY) + .to_json_string().c_str(), info.last ? "" : ","); return true; } @@ -598,8 +599,10 @@ output_query_results (const QueryResults& qres, const MuConfig *opts, GError **e gboolean rv{true}; output_func (NULL, FirstOutput, opts, NULL); + size_t n{0}; for (auto&& item: qres) { + n++; auto msg{item.floating_msg()}; if (!msg) continue; @@ -607,7 +610,9 @@ output_query_results (const QueryResults& qres, const MuConfig *opts, GError **e if (opts->after != 0 && mu_msg_get_timestamp(msg) < opts->after) continue; - rv = output_func (msg, {item.doc_id(), false, false, item.query_match()}, + rv = output_func (msg, {item.doc_id(), false, false, + n == qres.size(), /* last? */ + item.query_match()}, opts, err); if (!rv) break; |