lei_dedupe: adjust to prepare for saved searches

LeiSavedSearch will use a LeiDedupe-like internal API,
so we won't have to make as many changes to callsites
between saved and unsaved searches.

2 files changed, 11 insertions, 11 deletions

diff --git a/lib/PublicInbox/LeiDedupe.pm b/lib/PublicInbox/LeiDedupe.pm
index a62b3a7c..378f748e 100644
--- a/lib/PublicInbox/LeiDedupe.pm
+++ b/lib/PublicInbox/LeiDedupe.pm
@@ -41,8 +41,8 @@ sub smsg_hash ($) {
 sub dedupe_oid ($) {
         my ($skv) = @_;
         (sub { # may be called in a child process
-                my ($eml, $oid) = @_;
-                $skv->set_maybe(_oidbin($oid) // _regen_oid($eml), '');
+                my ($eml, $oidhex) = @_;
+                $skv->set_maybe(_oidbin($oidhex) // _regen_oid($eml), '');
         }, sub {
                 my ($smsg) = @_;
                 $skv->set_maybe(_oidbin($smsg->{blob}), '');
@@ -53,9 +53,9 @@ sub dedupe_oid ($) {
 sub dedupe_mid ($) {
         my ($skv) = @_;
         (sub { # may be called in a child process
-                my ($eml, $oid) = @_;
-                # TODO: lei will support non-public messages w/o Message-ID
-                my $mid = $eml->header_raw('Message-ID') // _oidbin($oid) //
+                my ($eml, $oidhex) = @_;
+                # lei supports non-public drafts w/o Message-ID
+                my $mid = $eml->header_raw('Message-ID') // _oidbin($oidhex) //
                         content_hash($eml);
                 $skv->set_maybe($mid, '');
         }, sub {
@@ -71,7 +71,7 @@ sub dedupe_mid ($) {
 sub dedupe_content ($) {
         my ($skv) = @_;
         (sub { # may be called in a child process
-                my ($eml) = @_; # oid = $_[1], ignored
+                my ($eml) = @_; # $oidhex = $_[1], ignored
                 $skv->set_maybe(content_hash($eml), '');
         }, sub {
                 my ($smsg) = @_;
@@ -104,8 +104,8 @@ sub new {
 # returns true on seen messages according to the deduplication strategy,
 # returns false if unseen
 sub is_dup {
-        my ($self, $eml, $oid) = @_;
-        !$self->[1]->($eml, $oid);
+        my ($self, $eml, $smsg) = @_;
+        !$self->[1]->($eml, $smsg ? $smsg->{blob} : undef);
 }
 
 sub is_smsg_dup {
diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 70164e40..7adbffe7 100644
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -194,7 +194,7 @@ sub _mbox_write_cb ($$) {
         sub { # for git_to_mail
                 my ($buf, $smsg, $eml) = @_;
                 $eml //= PublicInbox::Eml->new($buf);
-                return if $dedupe->is_dup($eml, $smsg->{blob});
+                return if $dedupe->is_dup($eml, $smsg);
                 $lse->xsmsg_vmd($smsg) if $lse;
                 $buf = $eml2mbox->($eml, $smsg);
                 return atomic_append($lei, $buf) if $atomic_append;
@@ -280,7 +280,7 @@ sub _maildir_write_cb ($$) {
                 $lse->xsmsg_vmd($smsg) if $lse;
                 return _buf2maildir($dst, $buf, $smsg) if !$dedupe;
                 $eml //= PublicInbox::Eml->new($$buf); # copy buf
-                return if $dedupe->is_dup($eml, $smsg->{blob});
+                return if $dedupe->is_dup($eml, $smsg);
                 undef $eml;
                 _buf2maildir($dst, $buf, $smsg);
         }
@@ -299,7 +299,7 @@ sub _imap_write_cb ($$) {
                 $mic // return $lei->fail; # mic may be undef-ed in last run
                 if ($dedupe) {
                         $eml //= PublicInbox::Eml->new($$bref); # copy bref
-                        return if $dedupe->is_dup($eml, $smsg->{blob});
+                        return if $dedupe->is_dup($eml, $smsg);
                 }
                 $lse->xsmsg_vmd($smsg) if $lse;
                 eval { $imap_append->($mic, $folder, $bref, $smsg, $eml) };