lei q: trim JSON output

[public-inbox.git] / lib / PublicInbox / LeiOverview.pm

diff --git a/lib/PublicInbox/LeiOverview.pm b/lib/PublicInbox/LeiOverview.pm
index 4db1d8c882e17afebbceafaaf3f0b07ba4df5436..1ce2a09878329645499e91be4c8e9a429c0f4d08 100644 (file)
--- a/lib/PublicInbox/LeiOverview.pm
+++ b/lib/PublicInbox/LeiOverview.pm
@@ -136,23 +136,26 @@ 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;
        if (my $r = delete $smsg->{references}) {
-               $smsg->{refs} = [ map { "<$_>" } ($r =~ m/$MID_EXTRACT/go) ];
+               $smsg->{refs} = [ map { $_ } ($r =~ m/$MID_EXTRACT/go) ];
        }
        if (my $m = delete($smsg->{mid})) {
-               $smsg->{'m'} = "<$m>";
+               $smsg->{'m'} = $m;
        }
        for my $f (qw(from to cc)) {
                my $v = delete $smsg->{$f} or next;
                $smsg->{substr($f, 0, 1)} = pairs($v);
        }
        $smsg->{'s'} = delete $smsg->{subject};
-       # can we be bothered to parse From/To/Cc into arrays?
-       scalar { %$smsg }; # unbless
+       my $kw = delete($smsg->{kw});
+       scalar { %$smsg, ($kw && scalar(@$kw) ? (kw => $kw) : ()) }; # unbless
 }
 
 sub ovv_atexit_child {
@@ -177,7 +180,10 @@ sub _json_pretty {
                                        $pair =~ s/(null|"),"/$1, "/g;
                                        $pair;
                                } @$v) . ']';
-                       } else { # references
+                       } elsif ($k eq 'kw') { # keywords are short, one-line
+                               $v = $json->encode($v);
+                               $v =~ s/","/", "/g;
+                       } else { # refs, labels, ...
                                $v = '[' . join($sep, map {
                                        substr($json->encode([$_]), 1, -1);
                                } @$v) . ']';
@@ -204,24 +210,24 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
        }
        $lei->{ovv_buf} = \(my $buf = '') if !$l2m;
        if ($l2m && !$ibxish) { # remote https?:// mboxrd
-               my $g2m = $l2m->can('git_to_mail');
                my $wcb = $l2m->write_cb($lei);
                sub {
                        my ($smsg, undef, $eml) = @_; # no mitem in $_[1]
                        $wcb->(undef, $smsg, $eml);
                };
        } elsif ($l2m && $l2m->{-wq_s1}) {
-               my $git_dir = $ibxish->git->{git_dir};
                sub {
                        my ($smsg, $mitem) = @_;
                        $smsg->{pct} = get_pct($mitem) if $mitem;
-                       $l2m->wq_io_do('write_mail', [], $git_dir, $smsg);
+                       $l2m->wq_io_do('write_mail', [], $smsg);
                }
        } elsif ($self->{fmt} =~ /\A(concat)?json\z/ && $lei->{opt}->{pretty}) {
                my $EOR = ($1//'') eq 'concat' ? "\n}" : "\n},";
+               my $lse = $lei->{sto}->search;
                sub { # DIY prettiness :P
                        my ($smsg, $mitem) = @_;
                        return if $dedupe->is_smsg_dup($smsg);
+                       $lse->xsmsg_vmd($smsg);
                        $smsg = _unbless_smsg($smsg, $mitem);
                        $buf .= "{\n";
                        $buf .= join(",\n", map {
@@ -241,9 +247,11 @@ sub ovv_each_smsg_cb { # runs in wq worker usually
                }
        } elsif ($json) {
                my $ORS = $self->{fmt} eq 'json' ? ",\n" : "\n"; # JSONL
+               my $lse = $lei->{sto}->search;
                sub {
                        my ($smsg, $mitem) = @_;
                        return if $dedupe->is_smsg_dup($smsg);
+                       $lse->xsmsg_vmd($smsg);
                        $buf .= $json->encode(_unbless_smsg(@_)) . $ORS;
                        return if length($buf) < 65536;
                        my $lk = $self->lock_for_scope;