replace most uses of PublicInbox::MIME with Eml

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 7b9e891508aa069ce2981ffd4baa45ff102dc025..7ca35403517ecd82e9e1a08f72c21c1d0234b08c 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -6,7 +6,7 @@
 package PublicInbox::WatchMaildir;
 use strict;
 use warnings;
-use PublicInbox::MIME;
+use PublicInbox::Eml;
 use PublicInbox::InboxWritable;
 use File::Temp 0.19 (); # 0.19 for ->newdir
 use PublicInbox::Filter::Base qw(REJECT);
@@ -62,12 +62,17 @@ sub new {
                        if (my $whs = $ibx->{watchheader}) {
                                for (@$whs) {
                                        my ($k, $v) = split(/:/, $_, 2);
+                                       # XXX should this be case-insensitive?
+                                       # Or, mutt-style, case-sensitive iff
+                                       # a capital letter exists?
                                        push @$watch_hdrs, [ $k, qr/\Q$v\E/ ];
                                }
                        }
                        if (my $list_ids = $ibx->{listid}) {
                                for (@$list_ids) {
-                                       my $re = qr/<[ \t]*\Q$_\E[ \t]*>/;
+                                       # RFC2919 section 6 stipulates
+                                       # "case insensitive equality"
+                                       my $re = qr/<[ \t]*\Q$_\E[ \t]*>/i;
                                        push @$watch_hdrs, ['List-Id', $re ];
                                }
                        }
@@ -175,10 +180,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;
                }
@@ -279,7 +282,7 @@ sub _spamcheck_cb {
                my ($mime) = @_;
                my $tmp = '';
                if ($sc->spamcheck($mime, \$tmp)) {
-                       return PublicInbox::MIME->new(\$tmp);
+                       return PublicInbox::Eml->new(\$tmp);
                }
                warn $mime->header('Message-ID')." failed spam check\n";
                undef;