v2writable: move git->cleanup to the correct place

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

diff --git a/script/public-inbox-learn b/script/public-inbox-learn
index 38c83243f8971e63859fe4261b7ba4d521ff2335..c4c4d4b95882cd45d36896519ad51381718d2f11 100755 (executable)
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used for training spam (via SpamAssassin) and removing messages from a
 # public-inbox
@@ -8,11 +8,8 @@ my $usage = "$0 (spam|ham) < /path/to/message";
 use strict;
 use warnings;
 use PublicInbox::Config;
-use PublicInbox::Git;
-use PublicInbox::Import;
+use PublicInbox::InboxWritable;
 use PublicInbox::MIME;
-use Email::MIME::ContentType;
-$Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect
 use PublicInbox::Address;
 use PublicInbox::Spamcheck::Spamc;
 my $train = shift or die "usage: $usage\n";
@@ -51,25 +48,34 @@ foreach my $h (qw(Cc To)) {
        }
 }
 
+if ($train eq 'spam') {
+       $pi_config->each_inbox(sub {
+               my ($ibx) = @_;
+               $ibx = PublicInbox::InboxWritable->new($ibx);
+               my $im = $ibx->importer(0);
+               $im->remove($mime, 'spam');
+               $im->done;
+       });
+}
+
 require PublicInbox::MDA if $train eq "ham";
 
 # n.b. message may be cross-posted to multiple public-inboxes
 foreach my $recipient (keys %dests) {
        my $dst = $pi_config->lookup($recipient) or next;
-       my $git_dir = $dst->{mainrepo} or next;
-       my $git = PublicInbox::Git->new($git_dir);
        # We do not touch GIT_COMMITTER_* env here so we can track
        # who trained the message.
-       my $name = $ENV{GIT_COMMITTER_NAME} || $dst->{name};
-       my $email = $ENV{GIT_COMMITTER_EMAIL} || $recipient;
-       my $im = PublicInbox::Import->new($git, $name, $email);
+       $dst->{name} = $ENV{GIT_COMMITTER_NAME} || $dst->{name};
+       $dst->{-primary_address} = $ENV{GIT_COMMITTER_EMAIL} || $recipient;
+       $dst = PublicInbox::InboxWritable->new($dst);
+       my $im = $dst->importer(0);
 
        if ($train eq "spam" || $train eq "rm") {
                # This needs to be idempotent, as my inotify trainer
                # may train for each cross-posted message, and this
                # script already learns for every list in
                # ~/.public-inbox/config
-               $im->remove($mime);
+               $im->remove($mime, $train);
        } else { # $train eq "ham"
                # no checking for spam here, we assume the message has
                # been reviewed by a human at this point: