watch: watchspam affects all configured inboxes

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 145b363689ee7aa42c292f99c15798a404b7ff24..b7c2d17a8fb7937694fc56fc8c5e6bb1470ffc59 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -18,21 +18,25 @@ sub new {
        my ($class, $config) = @_;
        my (%mdmap, @mdir, $spamc);
 
-       # XXX is "publicinboxlearn" really a good namespace for this?
-       my $k = 'publicinboxlearn.watchspam';
-       if (my $spamdir = $config->{$k}) {
-               if ($spamdir =~ s/\Amaildir://) {
-                       $spamdir =~ s!/+\z!!;
-                       # skip "new", no MUA has seen it, yet.
-                       my $cur = "$spamdir/cur";
-                       push @mdir, $cur;
-                       $mdmap{$cur} = 'watchspam';
-               } else {
-                       warn "unsupported $k=$spamdir\n";
+       # "publicinboxwatch" is the documented namespace
+       # "publicinboxlearn" is legacy but may be supported
+       # indefinitely...
+       foreach my $pfx (qw(publicinboxwatch publicinboxlearn)) {
+               my $k = "$pfx.watchspam";
+               if (my $spamdir = $config->{$k}) {
+                       if ($spamdir =~ s/\Amaildir://) {
+                               $spamdir =~ s!/+\z!!;
+                               # skip "new", no MUA has seen it, yet.
+                               my $cur = "$spamdir/cur";
+                               push @mdir, $cur;
+                               $mdmap{$cur} = 'watchspam';
+                       } else {
+                               warn "unsupported $k=$spamdir\n";
+                       }
                }
        }
 
-       $k = 'publicinboxwatch.spamcheck';
+       my $k = 'publicinboxwatch.spamcheck';
        my $spamcheck = $config->{$k};
        if ($spamcheck) {
                if ($spamcheck eq 'spamc') {
@@ -76,6 +80,7 @@ sub new {
                mdmap => \%mdmap,
                mdir => \@mdir,
                mdre => $mdre,
+               config => $config,
                importers => {},
        }, $class;
 }
@@ -95,15 +100,18 @@ sub _remove_spam {
        $path =~ /:2,[A-R]*S[T-Z]*\z/i or return;
        my $mime = _path_to_mime($path) or return;
        _force_mid($mime);
-       foreach my $inbox (values %{$self->{mdmap}}) {
-               next unless ref $inbox;
-               my $im = _importer_for($self, $inbox);
-               $im->remove($mime);
-               if (my $scrub = _scrubber_for($inbox)) {
-                       my $scrubbed = $scrub->scrub($mime) or next;
-                       $im->remove($scrubbed);
-               }
-       }
+       $self->{config}->each_inbox(sub {
+               my ($ibx) = @_;
+               eval {
+                       my $im = _importer_for($self, $ibx);
+                       $im->remove($mime);
+                       if (my $scrub = _scrubber_for($ibx)) {
+                               my $scrubbed = $scrub->scrub($mime) or return;
+                               $im->remove($scrubbed);
+                       }
+               };
+               warn "error removing spam at $path from $ibx->{name}\n" if $@;
+       })
 }
 
 # used to hash the relevant portions of a message when there are conflicts
@@ -214,7 +222,7 @@ sub _importer_for {
                my $git = $inbox->git;
                my $name = $inbox->{name};
                my $addr = $inbox->{-primary_address};
-               PublicInbox::Import->new($git, $name, $addr);
+               PublicInbox::Import->new($git, $name, $addr, $inbox);
        };
        $self->{importers}->{"$im"} = $im;
 }