1 files changed, 60 insertions, 17 deletions

diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm
index 5437190d..230df166 100644
--- a/lib/PublicInbox/DirIdle.pm
+++ b/lib/PublicInbox/DirIdle.pm
@@ -1,56 +1,99 @@
-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) 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)
 package PublicInbox::DirIdle;
-use strict;
+use v5.12;
 use parent 'PublicInbox::DS';
-use PublicInbox::Syscall qw(EPOLLIN EPOLLET);
+use PublicInbox::Syscall qw(EPOLLIN);
 use PublicInbox::In2Tie;
 
-my ($MAIL_IN, $ino_cls);
-if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) {
-        $MAIL_IN = Linux::Inotify2::IN_MOVED_TO() |
-                Linux::Inotify2::IN_CREATE();
-        $ino_cls = 'Linux::Inotify2';
+my ($MAIL_IN, $MAIL_GONE, $ino_cls);
+if ($^O eq 'linux' && eval { require PublicInbox::Inotify; 1 }) {
+        $MAIL_IN = PublicInbox::Inotify::IN_MOVED_TO() |
+                PublicInbox::Inotify::IN_CREATE();
+        $MAIL_GONE = PublicInbox::Inotify::IN_DELETE() |
+                        PublicInbox::Inotify::IN_DELETE_SELF() |
+                        PublicInbox::Inotify::IN_MOVE_SELF() |
+                        PublicInbox::Inotify::IN_MOVED_FROM();
+        $ino_cls = 'PublicInbox::Inotify';
 # 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, $cb) = @_;
         my $self = bless { cb => $cb }, $class;
         my $inot;
         if ($ino_cls) {
                 $inot = $ino_cls->new or die "E: $ino_cls->new: $!";
                 my $io = PublicInbox::In2Tie::io($inot);
-                $self->SUPER::new($io, EPOLLIN | EPOLLET);
+                $self->SUPER::new($io, EPOLLIN);
         } else {
                 require PublicInbox::FakeInotify;
                 $inot = PublicInbox::FakeInotify->new; # starts timer
         }
-
-        # Linux::Inotify2->watch or similar
-        $inot->watch($_, $MAIL_IN) for @$dirs;
         $self->{inot} = $inot;
-        PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
         $self;
 }
 
+sub add_watches {
+        my ($self, $dirs, $gone) = @_;
+        my $fl = $MAIL_IN | ($gone ? $MAIL_GONE : 0);
+        my @ret;
+        for my $d (@$dirs) {
+                my $w = $self->{inot}->watch($d, $fl) or next;
+                push @ret, $w;
+        }
+        PublicInbox::FakeInotify::poll_once($self) if !$ino_cls;
+        @ret
+}
+
+sub rm_watches {
+        my ($self, $dir) = @_;
+        my $inot = $self->{inot};
+        if (my $cb = $inot->can('rm_watches')) { # TODO for fake watchers
+                $cb->($inot, $dir);
+        }
+}
+
+sub close {
+        my ($self) = @_;
+        delete $self->{cb};
+        $self->SUPER::close; # if using real kevent/inotify
+}
+
 sub event_step {
         my ($self) = @_;
-        my $cb = $self->{cb};
-        local $PublicInbox::DS::in_loop = 0; # waitpid() synchronously
+        my $cb = $self->{cb} or return;
+        local $PublicInbox::DS::in_loop = 0; # waitpid() synchronously (FIXME)
         eval {
-                my @events = $self->{inot}->read; # Linux::Inotify2->read
+                my @events = $self->{inot}->read; # Inotify3->read
                 $cb->($_) for @events;
         };
         warn "$self->{inot}->read err: $@\n" if $@;
 }
 
+sub force_close {
+        my ($self) = @_;
+        my $inot = delete $self->{inot} // return;
+        if ($inot->can('fh')) { # Inotify3 or Linux::Inotify2 2.3+
+                $inot->fh->close or warn "CLOSE ERROR: $!";
+        } elsif ($inot->isa('Linux::Inotify2')) {
+                require PublicInbox::LI2Wrap;
+                PublicInbox::LI2Wrap::wrapclose($inot);
+        }
+}
+
 1;