1 files changed, 43 insertions, 27 deletions

diff --git a/lib/PublicInbox/LeiNoteEvent.pm b/lib/PublicInbox/LeiNoteEvent.pm
index d2429485..8d900d0c 100644
--- a/lib/PublicInbox/LeiNoteEvent.pm
+++ b/lib/PublicInbox/LeiNoteEvent.pm
@@ -8,13 +8,15 @@ use strict;
 use v5.10.1;
 use parent qw(PublicInbox::IPC);
 use PublicInbox::DS;
+use Errno qw(ENOENT);
 
 our $to_flush; # { cfgpath => $lei }
 
-sub flush_lei ($) {
-        my ($lei) = @_;
-        my $lne = delete $lei->{cfg}->{-lei_note_event};
-        $lne->wq_close(1, undef, $lei) if $lne; # runs _lei_wq_eof;
+sub flush_lei ($;$) {
+        my ($lei, $manual) = @_;
+        my $lne = delete $lei->{cfg}->{-lei_note_event} // return;
+        $lne->{lei_sock} = $lei->{sock} if $manual;
+        $lne->wq_close; # runs _lei_wq_eof;
 }
 
 # we batch up writes and flush every 5s (matching Linux default
@@ -25,13 +27,6 @@ sub flush_task { # PublicInbox::DS timer callback
         for my $lei (values %$todo) { flush_lei($lei) }
 }
 
-# sets a timer to flush
-sub note_event_arm_done ($) {
-        my ($lei) = @_;
-        PublicInbox::DS::add_uniq_timer('flush_timer', 5, \&flush_task);
-        $to_flush->{$lei->{cfg}->{'-f'}} //= $lei;
-}
-
 sub eml_event ($$$$) {
         my ($self, $eml, $vmd, $state) = @_;
         my $sto = $self->{lei}->{sto};
@@ -42,7 +37,9 @@ sub eml_event ($$$$) {
                 $sto->wq_do('index_eml_only', $eml, $vmd, $xoids);
         } elsif ($state =~ /\Atag-(?:rw|ro)\z/) {
                 my $docids = [];
-                my $c = $self->{lse}->kw_changed($eml, $vmd->{kw}, $docids);
+                my $c = eval {
+                        $self->{lse}->kw_changed($eml, $vmd->{kw}, $docids);
+                } // 1; # too new, assume changed since still to-be-committed.
                 if (scalar @$docids) { # already in lei/store
                         $sto->wq_do('set_eml_vmd', undef, $vmd, $docids) if $c;
                 } elsif (my $xoids = $self->{lei}->ale->xoids_for($eml)) {
@@ -54,10 +51,25 @@ sub eml_event ($$$$) {
         }
 }
 
-sub maildir_event { # via wq_io_do
+sub maildir_event { # via wq_nonblock_do
         my ($self, $fn, $vmd, $state) = @_;
-        my $eml = PublicInbox::InboxWritable::eml_from_path($fn) // return;
-        eml_event($self, $eml, $vmd, $state);
+        if (my $eml = PublicInbox::InboxWritable::eml_from_path($fn)) {
+                eml_event($self, $eml, $vmd, $state);
+        } elsif ($! == ENOENT) {
+                $self->{lms}->clear_src(@{$vmd->{sync_info}});
+        } # else: eml_from_path already warns
+}
+
+sub _mh_cb { # mh_read_one cb
+        my ($dir, $bn, $kw, $eml, $self, $state) = @_;
+}
+
+sub mh_event { # via wq_nonblock_do
+        my ($self, $folder, $bn, $state) = @_;
+        my $dir = substr($folder, 3);
+        require PublicInbox::MHreader; # if we forked early
+        my $mhr = PublicInbox::MHreader->new($dir, $self->{lei}->{3});
+        $mhr->mh_read_one($bn, \&_mh_cb, $self, $state);
 }
 
 sub lei_note_event {
@@ -65,19 +77,21 @@ sub lei_note_event {
         die "BUG: unexpected: @rest" if @rest;
         my $cfg = $lei->_lei_cfg or return; # gone (race)
         my $sto = $lei->_lei_store or return; # gone
-        return flush_lei($lei) if $folder eq 'done'; # special case
+        return flush_lei($lei, 1) if $folder eq 'done'; # special case
         my $lms = $lei->lms or return;
         $lms->lms_write_prepare if $new_cur eq ''; # for ->clear_src below
         $lei->{opt}->{quiet} = 1;
-        eval { $lms->arg2folder($lei, [ $folder ]) };
-        return if $@;
-        my $state = $cfg->get_1("watch.$folder", 'state') // 'tag-rw';
+        $lms->arg2folder($lei, [ $folder ]);
+        my $state = $cfg->get_1("watch.$folder.state") // 'tag-rw';
         return if $state eq 'pause';
-        return $lms->clear_src($folder, \$bn) if $new_cur eq '';
+        if ($new_cur eq '') {
+                my $id = $folder =~ /\Amaildir:/ ? \$bn : $bn + 0;
+                return $lms->clear_src($folder, $id);
+        }
         $lms->lms_pause;
         $lei->ale; # prepare
         $sto->write_prepare($lei);
-        require PublicInbox::MdirReader;
+        require PublicInbox::MHreader if $folder =~ /\Amh:/; # optimistic
         my $self = $cfg->{-lei_note_event} //= do {
                 my $wq = bless { lms => $lms }, __PACKAGE__;
                 # MUAs such as mutt can trigger massive rename() storms so
@@ -86,16 +100,21 @@ sub lei_note_event {
                 $jobs = 4 if $jobs > 4; # same default as V2Writable
                 my ($op_c, $ops) = $lei->workers_start($wq, $jobs);
                 $lei->wait_wq_events($op_c, $ops);
-                note_event_arm_done($lei);
+                PublicInbox::DS::add_uniq_timer('flush_timer', 5, \&flush_task);
+                $to_flush->{$lei->{cfg}->{'-f'}} //= $lei;
+                $wq->prepare_nonblock;
                 $lei->{lne} = $wq;
         };
         if ($folder =~ /\Amaildir:/i) {
+                require PublicInbox::MdirReader;
                 my $fl = PublicInbox::MdirReader::maildir_basename_flags($bn)
                         // return;
                 return if index($fl, 'T') >= 0;
                 my $kw = PublicInbox::MdirReader::flags2kw($fl);
                 my $vmd = { kw => $kw, sync_info => [ $folder, \$bn ] };
-                $self->wq_io_do('maildir_event', [], $fn, $vmd, $state);
+                $self->wq_nonblock_do('maildir_event', $fn, $vmd, $state);
+        } elsif ($folder =~ /\Amh:/) {
+                $self->wq_nonblock_do('mh_event', $folder, $bn, $state);
         } # else: TODO: imap
 }
 
@@ -108,10 +127,7 @@ sub ipc_atfork_child {
 }
 
 sub _lei_wq_eof { # EOF callback for main lei daemon
-        my ($lei) = @_;
-        my $lne = delete $lei->{lne} or return $lei->fail;
-        $lei->sto_done_request;
-        $lne->wq_wait_old($lei->can('wq_done_wait'), $lei);
+        $_[0]->wq_eof('lne');
 }
 
 1;