script/*{mda,learn}: no strict params for Email::MIME::ContentType

[public-inbox.git] / script / public-inbox-mda

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 24feeb81d355a8d4f188a5d7ea4bafa33c66f07a..bb78c4e605ff72fa13619e1d7e1206a5c88f9925 100755 (executable)
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -9,12 +9,15 @@ my $usage = 'public-inbox-mda < rfc2822_message';
 
 use Email::Filter;
 use Email::MIME;
-use Email::Address;
+use Email::MIME::ContentType;
+$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect
 use File::Path::Expand qw/expand_filename/;
 use IPC::Run qw(run);
 use PublicInbox::MDA;
 use PublicInbox::Filter;
 use PublicInbox::Config;
+use PublicInbox::Import;
+use PublicInbox::Git;
 
 # n.b: hopefully we can setup the emergency path without bailing due to
 # user error, we really want to setup the emergency destination ASAP
@@ -47,7 +50,7 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
        } elsif ($fcfg eq 'scrub') {
                $filter_arg = undef; # the default for legacy versions
        } else {
-               warn "publicinbox.$dst->{listname}.filter=$fcfg invalid\n";
+               warn "publicinbox.$dst->{name}.filter=$fcfg invalid\n";
                warn "must be either 'scrub' or 'reject' (the default)\n";
        }
 
@@ -58,20 +61,20 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
                        PublicInbox::MDA->set_list_headers($msg, $dst);
                        $filter->simple($msg);
 
-                       my ($name, $email, $date) =
-                                       PublicInbox::MDA->author_info($msg);
-
                        END {
                                index_sync($main_repo) if ($? == 0);
                        };
-
-                       local $ENV{GIT_AUTHOR_NAME} = $name;
-                       local $ENV{GIT_AUTHOR_EMAIL} = $email;
-                       local $ENV{GIT_AUTHOR_DATE} = $date;
-                       local $ENV{GIT_COMMITTER_EMAIL} = $recipient;
-                       local $ENV{GIT_COMMITTER_NAME} = $dst->{listname};
-
-                       $filter->pipe(PublicInbox::MDA->cmd, $main_repo);
+                       my $git = PublicInbox::Git->new($main_repo);
+                       my $im = PublicInbox::Import->new($git,
+                                               $dst->{name}, $recipient);
+                       if (defined $im->add($msg)) {
+                               $im->done;
+                               $filter->ignore; # exits
+                       }
+                       # this message is similar to what ssoma-mda shows:
+                       print STDERR "CONFLICT: Message-ID: ",
+                               $msg->header_obj->header_raw('Message-ID'),
+                               " exists\n";
                }
        }
 } else {
@@ -100,10 +103,6 @@ sub do_spamc {
 
 sub index_sync {
        my ($git_dir) = @_;
-
-       # potentially user-visible, ignore errors:
-       system('git', "--git-dir=$git_dir", 'update-server-info');
-
        eval {
                require PublicInbox::SearchIdx;
                PublicInbox::SearchIdx->new($git_dir, 2)->index_sync;