import: force Message-ID generation for v1 here

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index a3fab428fc3a4c14bfa3ef33fa4690bfabf20c8d..3adebddefe85659aaefef95ea05ed57a4cdf0849 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -7,8 +7,6 @@ package PublicInbox::WatchMaildir;
 use strict;
 use warnings;
 use PublicInbox::MIME;
-use Email::MIME::ContentType;
-$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect
 use PublicInbox::Git;
 use PublicInbox::Import;
 use PublicInbox::MDA;
@@ -93,7 +91,7 @@ sub _done_for_now {
        my ($self) = @_;
        my $importers = $self->{importers};
        foreach my $im (values %$importers) {
-               $im->done if $im->{nchg};
+               $im->barrier;
        }
 
        my $opendirs = $self->{opendirs};
@@ -127,7 +125,6 @@ sub _remove_spam {
        # path must be marked as (S)een
        $path =~ /:2,[A-R]*S[T-Za-z]*\z/ or return;
        my $mime = _path_to_mime($path) or return;
-       _force_mid($mime);
        $self->{config}->each_inbox(sub {
                my ($ibx) = @_;
                eval {
@@ -146,31 +143,10 @@ sub _remove_spam {
        })
 }
 
-# used to hash the relevant portions of a message when there are conflicts
-sub _hash_mime2 {
-       my ($mime) = @_;
-       require Digest::SHA;
-       my $dig = Digest::SHA->new('SHA-1');
-       $dig->add($mime->header_obj->header_raw('Subject'));
-       $dig->add($mime->body_raw);
-       $dig->hexdigest;
-}
-
-sub _force_mid {
-       my ($mime) = @_;
-       # probably a bad idea, but we inject a Message-Id if
-       # one is missing, here..
-       my $mid = $mime->header_obj->header_raw('Message-Id');
-       if (!defined $mid || $mid =~ /\A\s*\z/) {
-               $mid = '<' . _hash_mime2($mime) . '@generated>';
-               $mime->header_set('Message-Id', $mid);
-       }
-}
-
 sub _try_path {
        my ($self, $path) = @_;
        my @p = split(m!/+!, $path);
-       return if $p[-1] !~ /\A[a-zA-Z0-9][\w:,=\.]+\z/;
+       return if $p[-1] !~ /\A[a-zA-Z0-9][\-\w:,=\.]+\z/;
        if ($p[-1] =~ /:2,([A-Z]+)\z/i) {
                my $flags = $1;
                return if $flags =~ /[DT]/; # no [D]rafts or [T]rashed mail
@@ -202,7 +178,6 @@ sub _try_path {
                $mime = $ret;
        }
 
-       _force_mid($mime);
        $im->add($mime, $self->{spamcheck});
 }