diff options
| author | Eric Wong <e@80x24.org> | 2021-10-21 21:10:29 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-10-22 00:54:48 +0000 |
| commit | ef45dcc37abfdf467597f912ec290c4d39218ef6 (patch) | |
| tree | 0ad5aa018400bfd74ef8e575b7dc97248bae3cd3 | |
| parent | 0c6132ee390667ad643f6aa6053f978f4267b2e4 (diff) | |
| download | public-inbox-ef45dcc37abfdf467597f912ec290c4d39218ef6.tar.gz | |
Whether an MUA uses rename(2) or link(2)+unlink(2) combination should not matter to us. We should be able to handle both cases.
| -rw-r--r-- | lib/PublicInbox/DirIdle.pm | 3 | ||||
| -rw-r--r-- | lib/PublicInbox/FakeInotify.pm | 3 | ||||
| -rw-r--r-- | lib/PublicInbox/LEI.pm | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/PublicInbox/DirIdle.pm b/lib/PublicInbox/DirIdle.pm index 270d3829..9206da9c 100644 --- a/lib/PublicInbox/DirIdle.pm +++ b/lib/PublicInbox/DirIdle.pm @@ -14,7 +14,8 @@ if ($^O eq 'linux' && eval { require Linux::Inotify2; 1 }) { 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 641bc5bd..6d269601 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 @@ use strict; 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 c1f28f7b..b68e526b 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -1198,7 +1198,7 @@ sub dir_idle_handler ($) { # PublicInbox::DirIdle callback 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 { |