doc: various overview-level module comments

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 8d8e817ad767d9097b438c84ae336ea503e12a4b..2d4c6f4340af5d34b01148be0878743be52fc5eb 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -28,8 +28,7 @@ sub new {
        foreach my $pfx (qw(publicinboxwatch publicinboxlearn)) {
                my $k = "$pfx.watchspam";
                if (my $dir = $config->{$k}) {
-                       if ($dir =~ s/\Amaildir://) {
-                               $dir =~ s!/+\z!!;
+                       if (is_maildir($dir)) {
                                # skip "new", no MUA has seen it, yet.
                                my $cur = "$dir/cur";
                                my $old = $mdmap{$cur};
@@ -60,8 +59,7 @@ sub new {
                my $ibx = $_[0] = PublicInbox::InboxWritable->new($_[0]);
 
                my $watch = $ibx->{watch} or return;
-               if ($watch =~ s/\Amaildir://) {
-                       $watch =~ s!/+\z!!;
+               if (is_maildir($watch)) {
                        if (my $wm = $ibx->{watchheader}) {
                                my ($k, $v) = split(/:/, $wm, 2);
                                $ibx->{-watchheader} = [ $k, qr/\Q$v\E/ ];
@@ -123,7 +121,7 @@ sub _remove_spam {
                eval {
                        my $im = _importer_for($self, $ibx);
                        $im->remove($mime, 'spam');
-                       if (my $scrub = $ibx->filter) {
+                       if (my $scrub = $ibx->filter($im)) {
                                my $scrubbed = $scrub->scrub($mime, 1);
                                $scrubbed or return;
                                $scrubbed == REJECT() and return;
@@ -161,7 +159,8 @@ sub _try_path {
                        my $v = $mime->header_obj->header_raw($wm->[0]);
                        next unless ($v && $v =~ $wm->[1]);
                }
-               if (my $scrub = $ibx->filter) {
+
+               if (my $scrub = $ibx->filter($im)) {
                        my $ret = $scrub->scrub($mime) or next;
                        $ret == REJECT() and next;
                        $mime = $ret;
@@ -278,4 +277,11 @@ sub _spamcheck_cb {
        }
 }
 
+sub is_maildir {
+       $_[0] =~ s!\Amaildir:!! or return;
+       $_[0] =~ tr!/!/!s;
+       $_[0] =~ s!/\z!!;
+       $_[0];
+}
+
 1;