lei q: reinstate smsg dedupe

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

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 9a383cef0ea98ef928d145c1869052cd8a21b82a..69d2f9a604dd02a9fcd4014fe4a8936b3af99f10 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -5,43 +5,8 @@
 package PublicInbox::LeiQuery;
 use strict;
 use v5.10.1;
-use PublicInbox::MID qw($MID_EXTRACT);
-use POSIX qw(strftime);
-use PublicInbox::Address qw(pairs);
 use PublicInbox::DS qw(dwaitpid);
 
-sub _iso8601 ($) { strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($_[0])) }
-
-# prepares an smsg for JSON
-sub _smsg_unbless ($) {
-       my ($smsg) = @_;
-
-       delete @$smsg{qw(lines bytes)};
-       $smsg->{rcvd} = _iso8601(delete $smsg->{ts}); # JMAP receivedAt
-       $smsg->{dt} = _iso8601(delete $smsg->{ds}); # JMAP UTCDate
-
-       if (my $r = delete $smsg->{references}) {
-               $smsg->{references} = [
-                               map { "<$_>" } ($r =~ m/$MID_EXTRACT/go) ];
-       }
-       if (my $m = delete($smsg->{mid})) {
-               $smsg->{'m'} = "<$m>";
-       }
-       # XXX breaking to/cc, into structured arrays or tables which
-       # distinguish "$phrase <$address>" causes pretty printing JSON
-       # to take up too much vertical space.  I can't get either
-       # Cpanel::JSON::XS or JSON::XS or jq(1) only indent when
-       # wrapping is necessary, rather than blindly indenting and
-       # adding vertical space everywhere.
-       for my $f (qw(from to cc)) {
-               my $v = delete $smsg->{$f} or next;
-               $smsg->{substr($f, 0, 1)} = $v;
-       }
-       $smsg->{'s'} = delete $smsg->{subject};
-       # can we be bothered to parse From/To/Cc into arrays?
-       scalar { %$smsg }; # unbless
-}
-
 sub _vivify_external { # _externals_each callback
        my ($src, $dir) = @_;
        if (-f "$dir/ei.lock") {
@@ -61,45 +26,30 @@ sub lei_q {
        my $sto = $self->_lei_store(1);
        my $cfg = $self->_lei_cfg(1);
        my $opt = $self->{opt};
-       require PublicInbox::LeiDedupe;
-       my $dd = PublicInbox::LeiDedupe->new($self);
 
        # --local is enabled by default
        # src: LeiXSearch || LeiSearch || Inbox
        my @srcs;
        require PublicInbox::LeiXSearch;
+       require PublicInbox::LeiOverview;
+       require PublicInbox::LeiDedupe;
        my $lxs = PublicInbox::LeiXSearch->new;
 
        # --external is enabled by default, but allow --no-external
        if ($opt->{external} // 1) {
                $self->_externals_each(\&_vivify_external, \@srcs);
        }
-       my $j = $opt->{jobs} // scalar(@srcs) > 3 ? 3 : scalar(@srcs);
+       my $j = $opt->{jobs} // (scalar(@srcs) > 3 ? 3 : scalar(@srcs));
        $j = 1 if !$opt->{thread};
        $j++ if $opt->{'local'}; # for sto->search below
-       if ($self->{sock}) {
-               $self->atfork_prepare_wq($lxs);
-               $lxs->wq_workers_start('lei_xsearch', $j, $self->oldset)
-                       // $self->wq_workers($j);
-       }
+       $self->atfork_prepare_wq($lxs);
+       $lxs->wq_workers_start('lei_xsearch', $j, $self->oldset)
+               // $lxs->wq_workers($j);
+
        unshift(@srcs, $sto->search) if $opt->{'local'};
-       my $out = $opt->{output} // '-';
-       $out = 'json:/dev/stdout' if $out eq '-';
-       my $isatty = -t $self->{1};
        # no forking workers after this
-       my $pid_old12 = $self->start_pager if $isatty;
-       my $json = substr($out, 0, 5) eq 'json:' ?
-               ref(PublicInbox::Config->json)->new : undef;
-       if ($json) {
-               if ($opt->{pretty} //= $isatty) {
-                       $json->pretty(1)->space_before(0);
-                       $json->indent_length($opt->{indent} // 2);
-               }
-               $json->utf8; # avoid Wide character in print warnings
-               $json->ascii(1) if $opt->{ascii}; # for "\uXXXX"
-               $json->canonical;
-       }
-
+       $self->{ovv} = PublicInbox::LeiOverview->new($self);
+       $self->{dd} = PublicInbox::LeiDedupe->new($self);
        my %mset_opt = map { $_ => $opt->{$_} } qw(thread limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
        $mset_opt{qstr} = join(' ', map {;
@@ -124,11 +74,8 @@ sub lei_q {
        $mset_opt{relevance} //= -2 if $opt->{thread};
        # my $wcb = PublicInbox::LeiToMail->write_cb($out, $self);
        $self->{mset_opt} = \%mset_opt;
+       $self->{ovv}->ovv_begin($self);
        $lxs->do_query($self, \@srcs);
-       if ($pid_old12) {
-               $self->{$_} = $pid_old12->[$_] for (1, 2);
-               dwaitpid($pid_old12->[0], undef, $self->{sock});
-       }
 }
 
 1;