dir_idle: support IN_DELETE_SELF|IN_MOVE_SELF, too

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

diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm
index 458285e24d72732e539d0f4a6f1f5d52849af266..5142d005e4aa326543fe8a99dca0c4e491eb42c5 100644 (file)
--- a/lib/PublicInbox/DirIdle.pm
+++ b/lib/PublicInbox/DirIdle.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Used by public-inbox-watch for Maildir (and possibly MH in the future)
@@ -8,22 +8,31 @@ use parent 'PublicInbox::DS';
 use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
 use PublicInbox::In2Tie;
 
-my ($MAIL_IN, $ino_cls);
+my ($MAIL_IN, $MAIL_GONE, $ino_cls);
 if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
        $MAIL_IN = Linux::Inotify2::IN_MOVED_TO() |
                Linux::Inotify2::IN_CREATE();
+       $MAIL_GONE = Linux::Inotify2::IN_DELETE() |
+                       Linux::Inotify2::IN_DELETE_SELF() |
+                       Linux::Inotify2::IN_MOVE_SELF();
        $ino_cls = 'Linux::Inotify2';
 # Perl 5.22+ is needed for fileno(DIRHANDLE) support:
 } elsif ($^V ge v5.22 && eval { require PublicInbox::KQNotify }) {
        $MAIL_IN = PublicInbox::KQNotify::MOVED_TO_OR_CREATE();
+       $MAIL_GONE = PublicInbox::KQNotify::NOTE_DELETE() |
+               PublicInbox::KQNotify::NOTE_REVOKE() |
+               PublicInbox::KQNotify::NOTE_RENAME();
        $ino_cls = 'PublicInbox::KQNotify';
 } else {
        require PublicInbox::FakeInotify;
        $MAIL_IN = PublicInbox::FakeInotify::MOVED_TO_OR_CREATE();
+       $MAIL_GONE = PublicInbox::FakeInotify::IN_DELETE() |
+                       PublicInbox::FakeInotify::IN_DELETE_SELF() |
+                       PublicInbox::FakeInotify::IN_MOVE_SELF();
 }
 
 sub new {
-       my ($class, $dirs, $cb) = @_;
+       my ($class, $dirs, $cb, $gone) = @_;
        my $self = bless { cb => $cb }, $class;
        my $inot;
        if ($ino_cls) {
@@ -36,7 +45,9 @@ sub new {
        }
 
        # Linux::Inotify2->watch or similar
-       $inot->watch($_, $MAIL_IN) for @$dirs;
+       my $fl = $MAIL_IN;
+       $fl |= $MAIL_GONE if $gone;
+       $inot->watch($_, $fl) for @$dirs;
        $self->{inot} = $inot;
        PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
        $self;