lib/PublicInbox/DirIdle.pm | 3 ++- lib/PublicInbox/FakeInotify.pm | 3 +++ lib/PublicInbox/LEI.pm | 2 +- diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm index 270d3829bc3e25669a433def9346bca0a0d927ff..9206da9cb710186462ffefd10cb4af0764f7e615 100644 --- a/lib/PublicInbox/DirIdle.pm +++ b/lib/PublicInbox/DirIdle.pm @@ -14,7 +14,8 @@ $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(); + Linux::Inotify2::IN_MOVE_SELF() | + Linux::Inotify2::IN_MOVED_FROM(); $ino_cls = 'Linux::Inotify2'; # Perl 5.22+ is needed for fileno(DIRHANDLE) support: } elsif ($^V ge v5.22 && eval { require PublicInbox::KQNotify }) { diff --git a/lib/PublicInbox/FakeInotify.pm b/lib/PublicInbox/FakeInotify.pm index 641bc5bdc7c62987e390ad0f134dcdee32930774..6d2696019d8324fc3676d4e49efb783e10efc15a 100644 --- a/lib/PublicInbox/FakeInotify.pm +++ b/lib/PublicInbox/FakeInotify.pm @@ -10,6 +10,7 @@ use parent qw(Exporter); use Time::HiRes qw(stat); use PublicInbox::DS qw(add_timer); sub IN_MODIFY () { 0x02 } # match Linux inotify +# my $IN_MOVED_FROM 0x00000040 /* File was moved from X. */ # my $IN_MOVED_TO = 0x80; # my $IN_CREATE = 0x100; sub MOVED_TO_OR_CREATE () { 0x80 | 0x100 } @@ -136,6 +137,7 @@ sub fullname { ${$_[0]} } sub IN_DELETE { 0 } +sub IN_MOVED_FROM { 0 } sub IN_DELETE_SELF { 0 } package PublicInbox::FakeInotify::GoneEvent; @@ -143,6 +145,7 @@ use strict; our @ISA = qw(PublicInbox::FakeInotify::Event); sub IN_DELETE { 1 } +sub IN_MOVED_FROM { 0 } package PublicInbox::FakeInotify::SelfGoneEvent; use strict; diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index c1f28f7b31bf03d82bfe22eb76a226988f307054..b68e526bf365e056b8044a5fc89ff7527ca75a93 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -1198,7 +1198,7 @@ my ($ev) = @_; # Linux::Inotify2::Event or duck type my $fn = $ev->fullname; if ($fn =~ m!\A(.+)/(new|cur)/([^/]+)\z!) { # Maildir file my ($mdir, $nc, $bn) = ($1, $2, $3); - $nc = '' if $ev->IN_DELETE; + $nc = '' if $ev->IN_DELETE || $ev->IN_MOVED_FROM; for my $f (keys %{$MDIR2CFGPATH->{$mdir} // {}}) { my $cfg = $PATH2CFG{$f} // next; eval {