smsg: make parse_references an object method

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

diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm
index 1c093a94ca35389aadfdeabf622cfccd25af821a..fb608d00611455237a68b726becd6a76f4073da4 100644 (file)
--- a/lib/PublicInbox/LeiXSearch.pm
+++ b/lib/PublicInbox/LeiXSearch.pm
@@ -15,6 +15,7 @@ use File::Temp 0.19 (); # 0.19 for ->newdir
 use File::Spec ();
 use PublicInbox::Search qw(xap_terms);
 use PublicInbox::Spawn qw(popen_rd);
+use PublicInbox::MID qw(mids);
 
 sub new {
        my ($class) = @_;
@@ -120,8 +121,6 @@ sub query_thread_mset { # for --thread
        my $mo = { %{$lei->{mset_opt}} };
        my $mset;
        my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $ibxish);
-       my $dedupe = $lei->{dedupe} // die 'BUG: {dedupe} missing';
-       $dedupe->prepare_dedupe;
        do {
                $mset = $srch->mset($mo->{qstr}, $mo);
                my $ids = $srch->mset_to_artnums($mset, $mo);
@@ -132,7 +131,6 @@ sub query_thread_mset { # for --thread
                        for my $n (@{$ctx->{xids}}) {
                                my $smsg = $over->get_art($n) or next;
                                wait_startq($startq) if $startq;
-                               next if $dedupe->is_smsg_dup($smsg);
                                my $mitem = delete $n2item{$smsg->{num}};
                                $each_smsg->($smsg, $mitem);
                        }
@@ -155,14 +153,11 @@ sub query_mset { # non-parallel for non-"--thread" users
                attach_external($self, $loc);
        }
        my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $self);
-       my $dedupe = $lei->{dedupe} // die 'BUG: {dedupe} missing';
-       $dedupe->prepare_dedupe;
        do {
                $mset = $self->mset($mo->{qstr}, $mo);
                for my $mitem ($mset->items) {
                        my $smsg = smsg_for($self, $mitem) or next;
                        wait_startq($startq) if $startq;
-                       next if $dedupe->is_smsg_dup($smsg);
                        $each_smsg->($smsg, $mitem);
                }
        } while (_mset_more($mset, $mo));
@@ -174,10 +169,10 @@ sub each_eml { # callback for MboxReader->mboxrd
        my ($eml, $self, $lei, $each_smsg) = @_;
        my $smsg = bless {}, 'PublicInbox::Smsg';
        $smsg->populate($eml);
+       $smsg->parse_references($eml, mids($eml));
        $smsg->{$_} //= '' for qw(from to cc ds subject references mid);
        delete @$smsg{qw(From Subject -ds -ts)};
        if (my $startq = delete($self->{5})) { wait_startq($startq) }
-       return if !$lei->{l2m} && $lei->{dedupe}->is_smsg_dup($smsg);
        $each_smsg->($smsg, undef, $eml);
 }
 
@@ -189,9 +184,7 @@ sub query_remote_mboxrd {
        my ($opt, $env) = @$lei{qw(opt env)};
        my @qform = (q => $lei->{mset_opt}->{qstr}, x => 'm');
        push(@qform, t => 1) if $opt->{thread};
-       my $dedupe = $lei->{dedupe} // die 'BUG: {dedupe} missing';
-       $dedupe->prepare_dedupe;
-       my @cmd = qw(curl -XPOST -sSf);
+       my @cmd = (qw(curl -sSf -d), '');
        my $verbose = $opt->{verbose};
        push @cmd, '-v' if $verbose;
        for my $o ($lei->curl_opt) {
@@ -208,9 +201,9 @@ sub query_remote_mboxrd {
        }
        $opt->{torsocks} = 'false' if $opt->{'no-torsocks'};
        my $tor = $opt->{torsocks} //= 'auto';
+       my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei);
        for my $uri (@$uris) {
                $uri->query_form(@qform);
-               my $each_smsg = $lei->{ovv}->ovv_each_smsg_cb($lei, $uri);
                my $cmd = [ @cmd, $uri->as_string ];
                if ($tor eq 'auto' && substr($uri->host, -6) eq '.onion' &&
                                (($env->{LD_PRELOAD}//'') !~ /torsocks/)) {
@@ -236,6 +229,7 @@ sub query_remote_mboxrd {
                        $lei->child_error($?);
                }
        }
+       undef $each_smsg;
        $lei->{ovv}->ovv_atexit_child($lei);
 }
 
@@ -311,7 +305,7 @@ sub start_query { # always runs in main (lei-daemon) process
                for my $ibxish (locals($self)) {
                        $self->wq_do('query_thread_mset', $io, $lei, $ibxish);
                }
-       } else {
+       } elsif (locals($self)) {
                $self->wq_do('query_mset', $io, $lei);
        }
        my $i = 0;
@@ -389,9 +383,8 @@ sub ipc_atfork_prepare {
                require PublicInbox::MboxReader;
                require IO::Uncompress::Gunzip;
        }
-       # (0: done_wr, 1: stdout|mbox, 2: stderr,
-       #  3: sock, 4: $l2m->{-wq_s1}, 5: $startq)
-       $self->wq_set_recv_modes(qw[+<&= >&= >&= +<&= +<&= <&=]);
+       # FDS: (0: done_wr, 1: stdout|mbox, 2: stderr,
+       #       3: sock, 4: $l2m->{-wq_s1}, 5: $startq)
        $self->SUPER::ipc_atfork_prepare; # PublicInbox::IPC
 }