From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id AE3761F9FC
	for <meta@public-inbox.org>; Sat, 20 Mar 2021 12:40:31 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] lei q: trim JSON output
Date: Sat, 20 Mar 2021 18:40:31 +0600
Message-Id: <20210320124031.30983-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

Stop showing `docid' since it's not useful with shards.

`bytes' and `lines' are probably noise, but maybe could be
visible in some "fuller" view.
---
 lib/PublicInbox/LeiOverview.pm | 8 ++++++--
 lib/PublicInbox/LeiXSearch.pm  | 3 ++-
 t/lei-import.t                 | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 521bca50..1ce2a098 100644
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -136,7 +136,10 @@ sub ovv_end {
 sub _unbless_smsg {
 	my ($smsg, $mitem) = @_;
 
-	delete @$smsg{qw(lines bytes num tid)};
+	# TODO: make configurable
+	# num/tid are nonsensical with multi-inbox search,
+	# lines/bytes are not generally useful
+	delete @$smsg{qw(num tid lines bytes)};
 	$smsg->{rt} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt
 	$smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate
 	$smsg->{pct} = get_pct($mitem) if $mitem;
@@ -151,7 +154,8 @@ sub _unbless_smsg {
 		$smsg->{substr($f, 0, 1)} = pairs($v);
 	}
 	$smsg->{'s'} = delete $smsg->{subject};
-	scalar { %$smsg }; # unbless
+	my $kw = delete($smsg->{kw});
+	scalar { %$smsg, ($kw && scalar(@$kw) ? (kw => $kw) : ()) }; # unbless
 }
 
 sub ovv_atexit_child {
diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 57717b87..17171a7f 100644
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -70,6 +70,8 @@ sub mitem_kw ($$;$) {
 	my ($smsg, $mitem, $flagged) = @_;
 	my $kw = xap_terms('K', $mitem->get_document);
 	$kw->{flagged} = 1 if $flagged;
+	# we keep the empty array here to prevent expensive work in
+	# ->xsmsg_vmd, _unbless_smsg will clobber it iff it's empty
 	$smsg->{kw} = [ sort keys %$kw ];
 }
 
@@ -85,7 +87,6 @@ sub smsg_for {
 	my $smsg = $ibx->over->get_art($num);
 	return if $smsg->{bytes} == 0;
 	mitem_kw($smsg, $mitem) if $ibx->can('msg_keywords');
-	$smsg->{docid} = $docid;
 	$smsg;
 }
 
diff --git a/t/lei-import.t b/t/lei-import.t
index edb0cd20..e0b517f4 100644
--- a/t/lei-import.t
+++ b/t/lei-import.t
@@ -48,7 +48,7 @@ lei_ok([qw(import --no-kw -F eml -)], undef, $opt,
 lei(qw(q m:v@y));
 $res = json_utf8->decode($lei_out);
 is($res->[1], undef, 'only one result');
-is_deeply($res->[0]->{kw}, [], 'no keywords set');
+is($res->[0]->{kw}, undef, 'no keywords set');
 
 # see t/lei_to_mail.t for "import -F mbox*"
 });