watchmaildir: scan all matching headers

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 08b1aab43ad1e8a4f6b06e6def310a4ecfb29eb0..02e4b32f254a8933e81e60b2001b8cc5ebce63c8 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 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,12 +7,11 @@ package PublicInbox::WatchMaildir;
 use strict;
 use warnings;
 use PublicInbox::MIME;
-use PublicInbox::Spawn qw(spawn);
 use PublicInbox::InboxWritable;
-use File::Temp qw//;
-use PublicInbox::Filter::Base;
+use File::Temp 0.19 (); # 0.19 for ->newdir
+use PublicInbox::Filter::Base qw(REJECT);
 use PublicInbox::Spamcheck;
-*REJECT = *PublicInbox::Filter::Base::REJECT;
+*mime_from_path = \&PublicInbox::InboxWritable::mime_from_path;
 
 sub new {
        my ($class, $config) = @_;
@@ -60,9 +59,11 @@ sub new {
                my $watch = $ibx->{watch} or return;
                if (is_maildir($watch)) {
                        my $watch_hdrs = [];
-                       if (my $wh = $ibx->{watchheader}) {
-                               my ($k, $v) = split(/:/, $wh, 2);
-                               push @$watch_hdrs, [ $k, qr/\Q$v\E/ ];
+                       if (my $whs = $ibx->{watchheader}) {
+                               for (@$whs) {
+                                       my ($k, $v) = split(/:/, $_, 2);
+                                       push @$watch_hdrs, [ $k, qr/\Q$v\E/ ];
+                               }
                        }
                        if (my $list_ids = $ibx->{listid}) {
                                for (@$list_ids) {
@@ -124,7 +125,7 @@ sub _remove_spam {
        my ($self, $path) = @_;
        # path must be marked as (S)een
        $path =~ /:2,[A-R]*S[T-Za-z]*\z/ or return;
-       my $mime = _path_to_mime($path) or return;
+       my $mime = mime_from_path($path) or return;
        $self->{config}->each_inbox(sub {
                my ($ibx) = @_;
                eval {
@@ -166,7 +167,7 @@ sub _try_path {
                $warn_cb->(@_);
        };
        foreach my $ibx (@$inboxes) {
-               my $mime = _path_to_mime($path) or next;
+               my $mime = mime_from_path($path) or next;
                my $im = _importer_for($self, $ibx);
 
                # any header match means it's eligible for the inbox:
@@ -174,10 +175,8 @@ sub _try_path {
                        my $ok;
                        my $hdr = $mime->header_obj;
                        for my $wh (@$watch_hdrs) {
-                               my $v = $hdr->header_raw($wh->[0]);
-                               next unless defined($v) && $v =~ $wh->[1];
-                               $ok = 1;
-                               last;
+                               my @v = $hdr->header_raw($wh->[0]);
+                               $ok = grep(/$wh->[1]/, @v) and last;
                        }
                        next unless $ok;
                }
@@ -203,7 +202,8 @@ sub watch {
 
        # lazy load here, we may support watching via IMAP IDLE
        # in the future...
-       require Filesys::Notify::Simple;
+       eval { require Filesys::Notify::Simple } or
+               die "Filesys::Notify::Simple is currently required for $0\n";
        my $fsn = Filesys::Notify::Simple->new([@{$self->{mdir}}, $scandir]);
        $fsn->wait($cb) until $self->{quit};
 }
@@ -259,21 +259,6 @@ sub scan {
        trigger_scan($self, 'cont') if keys %$opendirs;
 }
 
-sub _path_to_mime {
-       my ($path) = @_;
-       if (open my $fh, '<', $path) {
-               local $/;
-               my $str = <$fh>;
-               $str or return;
-               return PublicInbox::MIME->new(\$str);
-       } elsif ($!{ENOENT}) {
-               return;
-       } else {
-               warn "failed to open $path: $!\n";
-               return;
-       }
-}
-
 sub _importer_for {
        my ($self, $ibx) = @_;
        my $importers = $self->{importers};