use strict;
use warnings;
use PublicInbox::Config;
-use Email::Simple;
+use Email::MIME;
use Email::Address;
use IPC::Run qw/run/;
my $train = shift or die "usage: $usage\n";
}
my $pi_config = PublicInbox::Config->new;
-my $simple;
-{
- local $/;
- $simple = Email::Simple->new(<>);
-}
+my $mime = Email::MIME->new(eval { local $/; <> });
# get all recipients
my %dests;
foreach my $h (qw(Cc To)) {
- foreach my $recipient (Email::Address->parse($simple->header($h))) {
+ foreach my $recipient (Email::Address->parse($mime->header($h))) {
$dests{lc($recipient->address)} = 1;
}
}
-my $in = $simple->as_string;
-$simple->body_set("");
+my ($name, $email, $date);
+
+if ($train eq "ham") {
+ require PublicInbox::MDA;
+ require PublicInbox::Filter;
+ PublicInbox::Filter->run($mime);
+ ($name, $email, $date) = PublicInbox::MDA->author_info($mime);
+}
+my $in = $mime->as_string;
my $err = 0;
my @output = qw(> /dev/null > /dev/null);
}
}
} else { # $train eq "ham"
- require PublicInbox::MDA;
- require PublicInbox::Filter;
-
- # no checking for errors here, we assume the message has
+ # no checking for spam here, we assume the message has
# been reviewed by a human at this point:
- PublicInbox::Filter->run($simple);
+ PublicInbox::MDA->set_list_headers($mime, $dst);
+ my $s = $mime->as_string;
- my ($name, $email, $date) =
- PublicInbox::MDA->author_info($simple);
local $ENV{GIT_AUTHOR_NAME} = $name;
local $ENV{GIT_AUTHOR_EMAIL} = $email;
local $ENV{GIT_AUTHOR_DATE} = $date;
# Ham messages are trained when they're marked into
# a SEEN state, so this is idempotent:
- run([PublicInbox::MDA->cmd, $git_dir], \$in, \$out, \$err);
+ run([PublicInbox::MDA->cmd, $git_dir], \$s, \$out, \$err);
if ($err !~ /CONFLICT/) {
$err = 1;
}
if (!run([qw(spamc -L), $train], \$in, @output)) {
$err = 1;
}
+
+ $err or eval {
+ require PublicInbox::Search;
+ umask 0022; # XXX FIXME use git config core.sharedRepository
+ my $s = PublicInbox::Search->new($git_dir, 2);
+ $s->index_sync;
+ };
}
+
exit $err;