use PublicInbox::MIME consistently

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

diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index cc7e7ec922ce812da43c0a6b5a323f7700e663cb..0c3445d5d06c5504ea59181739897e3a41216f8c 100644 (file)
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -11,8 +11,6 @@ use strict;
 use warnings;
 use Fcntl qw(:flock :DEFAULT);
 use PublicInbox::MIME;
-use Email::MIME::ContentType;
-$Email::MIME::ContentType::STRICT_PARAMS = 0;
 use base qw(PublicInbox::Search);
 use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
 use PublicInbox::MsgIter;
@@ -515,13 +513,15 @@ sub unindex_blob {
 }
 
 sub index_mm {
-       my ($self, $mime) = @_;
+       my ($self, $mime, $warn_existing) = @_;
        my $mid = mid_clean(mid_mime($mime));
        my $mm = $self->{mm};
        my $num = $mm->mid_insert($mid);
+       return $num if defined $num;
 
+       warn "<$mid> reused\n" if $warn_existing;
        # fallback to num_for since filters like RubyLang set the number
-       defined $num ? $num : $mm->num_for($mid);
+       $mm->num_for($mid);
 }
 
 sub unindex_mm {