X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FWatchMaildir.pm;h=5e79bb50cc1dc582af2f80d8f683097a3fe9db43;hp=0e2a6d2c3c5d6f6ea50580b5ad8e25eb9314278f;hb=8b0359338d1ec1e0ec7521c77b35f878931f4cd6;hpb=f9b70eb6ebbf96c2fe79ab2738ea4954c5a124f3

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 0e2a6d2c..5e79bb50 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -201,7 +201,7 @@ sub _try_path {
 	$im->add($mime, $self->{spamcheck});
 }
 
-sub quit { $_[0]->{quit} = 1 }
+sub quit { trigger_scan($_[0], 'quit') }
 
 sub watch {
 	my ($self) = @_;
@@ -215,7 +215,7 @@ sub watch {
 	# in the future...
 	require Filesys::Notify::Simple;
 	my $fsn = Filesys::Notify::Simple->new([@{$self->{mdir}}, $scandir]);
-	$fsn->wait($cb) until ($self->{quit});
+	$fsn->wait($cb) until $self->{quit};
 }
 
 sub trigger_scan {
@@ -227,6 +227,14 @@ sub trigger_scan {
 
 sub scan {
 	my ($self, $path) = @_;
+	if ($path =~ /quit\z/) {
+		%{$self->{opendirs}} = ();
+		_done_for_now($self);
+		$self->{quit} = 1;
+		return;
+	}
+	# else: $path =~ /(cont|full)\z/
+	return if $self->{quit};
 	my $max = 10;
 	my $opendirs = $self->{opendirs};
 	my @dirnames = keys %$opendirs;