mda: allow configuring globally without spamc support

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index d3ca2a16d75e6a81df3422a60f467cc7203a5b90..13dea168deb8d5e3a0e4604dd5694f4a865370d6 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -13,6 +13,9 @@ use PublicInbox::MDA;
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::InboxWritable;
 use File::Temp qw//;
+use PublicInbox::Filter::Base;
+use PublicInbox::Spamcheck;
+*REJECT = *PublicInbox::Filter::Base::REJECT;
 
 sub new {
        my ($class, $config) = @_;
@@ -38,19 +41,9 @@ sub new {
        }
 
        my $k = 'publicinboxwatch.spamcheck';
-       my $spamcheck = $config->{$k};
-       if ($spamcheck) {
-               if ($spamcheck eq 'spamc') {
-                       $spamcheck = 'PublicInbox::Spamcheck::Spamc';
-               }
-               if ($spamcheck =~ /::/) {
-                       eval "require $spamcheck";
-                       $spamcheck = _spamcheck_cb($spamcheck->new);
-               } else {
-                       warn "unsupported $k=$spamcheck\n";
-                       $spamcheck = undef;
-               }
-       }
+       my $default = undef;
+       my $spamcheck = PublicInbox::Spamcheck::get($config, $k, $default);
+       $spamcheck = _spamcheck_cb($spamcheck) if $spamcheck;
 
        # need to make all inboxes writable for spam removal:
        $config->each_inbox(sub { PublicInbox::InboxWritable->new($_[0]) });
@@ -124,8 +117,9 @@ sub _remove_spam {
                        my $im = _importer_for($self, $ibx);
                        $im->remove($mime, 'spam');
                        if (my $scrub = $ibx->filter) {
-                               my $scrubbed = $scrub->scrub($mime) or return;
-                               $scrubbed == 100 and return;
+                               my $scrubbed = $scrub->scrub($mime, 1);
+                               $scrubbed or return;
+                               $scrubbed == REJECT() and return;
                                $im->remove($scrubbed, 'spam');
                        }
                };
@@ -138,13 +132,7 @@ sub _remove_spam {
 
 sub _try_path {
        my ($self, $path) = @_;
-       my @p = split(m!/+!, $path);
-       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
-       }
-       return unless -f $path;
+       return unless PublicInbox::InboxWritable::is_maildir_path($path);
        if ($path !~ $self->{mdre}) {
                warn "unrecognized path: $path\n";
                return;
@@ -166,7 +154,7 @@ sub _try_path {
        }
        if (my $scrub = $inbox->filter) {
                my $ret = $scrub->scrub($mime) or return;
-               $ret == 100 and return;
+               $ret == REJECT() and return;
                $mime = $ret;
        }
 
@@ -258,14 +246,14 @@ sub _path_to_mime {
 
 sub _importer_for {
        my ($self, $ibx) = @_;
-       my $im = $ibx->importer(0);
        my $importers = $self->{importers};
+       my $im = $importers->{"$ibx"} ||= $ibx->importer(0);
        if (scalar(keys(%$importers)) > 2) {
-               delete $importers->{"$im"};
+               delete $importers->{"$ibx"};
                _done_for_now($self);
        }
 
-       $importers->{"$im"} = $im;
+       $importers->{"$ibx"} = $im;
 }
 
 sub _spamcheck_cb {