wwwtext: support $INBOX_URL/_/text/config/raw

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 064cedf0343ba1cbf7c2ed64cc659e17ba103c8b..f63140c8ed32724a20554cb9bbb014cefdfd709b 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # ref: https://cr.yp.to/proto/maildir.html
@@ -7,9 +7,6 @@ package PublicInbox::WatchMaildir;
 use strict;
 use warnings;
 use PublicInbox::MIME;
-use PublicInbox::Git;
-use PublicInbox::Import;
-use PublicInbox::MDA;
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::InboxWritable;
 use File::Temp qw//;
@@ -19,7 +16,7 @@ use PublicInbox::Spamcheck;
 
 sub new {
        my ($class, $config) = @_;
-       my (%mdmap, @mdir, $spamc, $spamdir);
+       my (%mdmap, @mdir, $spamc);
        my %uniq;
 
        # "publicinboxwatch" is the documented namespace
@@ -27,12 +24,12 @@ sub new {
        # indefinitely...
        foreach my $pfx (qw(publicinboxwatch publicinboxlearn)) {
                my $k = "$pfx.watchspam";
-               if (my $dir = $config->{$k}) {
-                       if ($dir =~ s/\Amaildir://) {
-                               $dir =~ s!/+\z!!;
+               defined(my $dirs = $config->{$k}) or next;
+               $dirs = [ $dirs ] if !ref($dirs);
+               for my $dir (@$dirs) {
+                       if (is_maildir($dir)) {
                                # skip "new", no MUA has seen it, yet.
                                my $cur = "$dir/cur";
-                               $spamdir = $cur;
                                my $old = $mdmap{$cur};
                                if (ref($old)) {
                                        foreach my $ibx (@$old) {
@@ -61,8 +58,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/ ];
@@ -84,7 +80,6 @@ sub new {
        $mdre = qr!\A($mdre)/!;
        bless {
                spamcheck => $spamcheck,
-               spamdir => $spamdir,
                mdmap => \%mdmap,
                mdir => \@mdir,
                mdre => $mdre,
@@ -125,7 +120,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;
@@ -154,6 +149,12 @@ sub _try_path {
        if (!ref($inboxes) && $inboxes eq 'watchspam') {
                return _remove_spam($self, $path);
        }
+
+       my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
+       local $SIG{__WARN__} = sub {
+               $warn_cb->("path: $path\n");
+               $warn_cb->(@_);
+       };
        foreach my $ibx (@$inboxes) {
                my $mime = _path_to_mime($path) or next;
                my $im = _importer_for($self, $ibx);
@@ -163,7 +164,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;
@@ -280,4 +282,11 @@ sub _spamcheck_cb {
        }
 }
 
+sub is_maildir {
+       $_[0] =~ s!\Amaildir:!! or return;
+       $_[0] =~ tr!/!/!s;
+       $_[0] =~ s!/\z!!;
+       $_[0];
+}
+
 1;