watch: imap: only remove \Seen spam

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

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 7d4139a5dcf983461193854495359c45556a97af..4ae400f7905fdb203fd3fa69507634e243b9c5c5 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -7,7 +7,7 @@ package PublicInbox::WatchMaildir;
 use strict;
 use warnings;
 use PublicInbox::Eml;
-use PublicInbox::InboxWritable qw(eml_from_path);
+use PublicInbox::InboxWritable qw(eml_from_path warn_ignore_cb);
 use PublicInbox::Filter::Base qw(REJECT);
 use PublicInbox::Spamcheck;
 use PublicInbox::Sigfd;
@@ -154,6 +154,7 @@ sub _remove_spam {
        # path must be marked as (S)een
        $path =~ /:2,[A-R]*S[T-Za-z]*\z/ or return;
        my $eml = eml_from_path($path) or return;
+       local $SIG{__WARN__} = warn_ignore_cb();
        $self->{config}->each_inbox(\&remove_eml_i, [ $self, $eml, $path ]);
 }
 
@@ -198,8 +199,8 @@ sub _try_path {
        }
        my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
        local $SIG{__WARN__} = sub {
-               $warn_cb->("path: $path\n");
-               $warn_cb->(@_);
+               my $pfx = ($_[0] // '') =~ /^([A-Z]: )/g ? $1 : '';
+               $warn_cb->($pfx, "path: $path\n", @_);
        };
        if (!ref($inboxes) && $inboxes eq 'watchspam') {
                return _remove_spam($self, $path);
@@ -287,7 +288,7 @@ sub cfg_intvl ($$$) {
 sub cfg_bool ($$$) {
        my ($cfg, $key, $url) = @_;
        my $orig = $cfg->urlmatch($key, $url) // return;
-       my $bool = PublicInbox::Config::_git_config_bool($orig);
+       my $bool = $cfg->git_bool($orig);
        warn "W: $key=$orig for $url is not boolean\n" unless defined($bool);
        $bool;
 }
@@ -381,8 +382,8 @@ sub mic_for ($$$) { # mic = Mail::IMAPClient
        $mic;
 }
 
-sub imap_import_msg ($$$$) {
-       my ($self, $url, $uid, $raw) = @_;
+sub imap_import_msg ($$$$$) {
+       my ($self, $url, $uid, $raw, $flags) = @_;
        # our target audience expects LF-only, save storage
        $$raw =~ s/\r\n/\n/sg;
 
@@ -393,9 +394,13 @@ sub imap_import_msg ($$$$) {
                        my $x = import_eml($self, $ibx, $eml);
                }
        } elsif ($inboxes eq 'watchspam') {
-               my $eml = PublicInbox::Eml->new($raw);
-               my $arg = [ $self, $eml, "$url UID:$uid" ];
-               $self->{config}->each_inbox(\&remove_eml_i, $arg);
+               # we don't remove unseen messages
+               if ($flags =~ /\\Seen\b/) {
+                       local $SIG{__WARN__} = warn_ignore_cb();
+                       my $eml = PublicInbox::Eml->new($raw);
+                       my $arg = [ $self, $eml, "$url UID:$uid" ];
+                       $self->{config}->each_inbox(\&remove_eml_i, $arg);
+               }
        } else {
                die "BUG: destination unknown $inboxes";
        }
@@ -444,9 +449,9 @@ sub imap_fetch_all ($$$) {
        my ($uids, $batch);
        my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
        local $SIG{__WARN__} = sub {
+               my $pfx = ($_[0] // '') =~ /^([A-Z]: )/g ? $1 : '';
                $batch //= '?';
-               $warn_cb->("$url UID:$batch\n");
-               $warn_cb->(@_);
+               $warn_cb->("$pfx$url UID:$batch\n", @_);
        };
        my $err;
        do {
@@ -472,7 +477,7 @@ sub imap_fetch_all ($$$) {
                        my @batch = splice(@$uids, 0, $bs);
                        $batch = join(',', @batch);
                        local $0 = "UID:$batch $mbx $sec";
-                       my $r = $mic->fetch_hash($batch, $req);
+                       my $r = $mic->fetch_hash($batch, $req, 'FLAGS');
                        unless ($r) { # network error?
                                $err = "E: $url UID FETCH $batch error: $!";
                                last;
@@ -481,7 +486,8 @@ sub imap_fetch_all ($$$) {
                                # messages get deleted, so holes appear
                                my $per_uid = delete $r->{$uid} // next;
                                my $raw = delete($per_uid->{$key}) // next;
-                               imap_import_msg($self, $url, $uid, \$raw);
+                               my $fl = $per_uid->{FLAGS} // '';
+                               imap_import_msg($self, $url, $uid, \$raw, $fl);
                                $last_uid = $uid;
                                last if $self->{quit};
                        }
@@ -877,7 +883,8 @@ sub nntp_fetch_all ($$$) {
        my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
        my ($err, $art);
        local $SIG{__WARN__} = sub {
-               $warn_cb->("$url ", $art ? ("ARTICLE $art") : (), "\n", @_);
+               my $pfx = ($_[0] // '') =~ /^([A-Z]: )/g ? $1 : '';
+               $warn_cb->("$pfx$url ", $art ? ("ARTICLE $art") : (), "\n", @_);
        };
        my $inboxes = $self->{nntp}->{$url};
        my $last_art;