inbox: reinstate periodic cleanup of Xapian and SQLite objects

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

diff --git a/script/public-inbox-learn b/script/public-inbox-learn
index 7ef2a312744c97f89de32a74ee8df4867a1ee142..a696d348bd5cfc519a02cbb2c383672208a145ef 100755 (executable)
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -10,7 +10,7 @@ use warnings;
 use PublicInbox::Config;
 use PublicInbox::Git;
 use PublicInbox::Import;
-use Email::MIME;
+use PublicInbox::MIME;
 use Email::MIME::ContentType;
 $Email::MIME::ContentType::STRICT_PARAMS = 0; # user input is imperfect
 use PublicInbox::Address;
@@ -23,10 +23,10 @@ if ($train !~ /\A(?:ham|spam)\z/) {
 my $spamc = PublicInbox::Spamcheck::Spamc->new;
 my $pi_config = PublicInbox::Config->new;
 my $err;
-my $mime = Email::MIME->new(eval {
+my $mime = PublicInbox::MIME->new(eval {
        local $/;
        my $data = scalar <STDIN>;
-       $data =~ s/\AFrom [^\r\n]*\r?\n//s;
+       $data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
        eval {
                if ($train eq 'ham') {
                        $spamc->hamlearn(\$data);
@@ -57,7 +57,7 @@ foreach my $recipient (keys %dests) {
        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->{inbox};
+       my $name = $ENV{GIT_COMMITTER_NAME} || $dst->{name};
        my $email = $ENV{GIT_COMMITTER_EMAIL} || $recipient;
        my $im = PublicInbox::Import->new($git, $name, $email);