mdir_reader: maildir_each_file: pass flags, skip Trash

[public-inbox.git] / lib / PublicInbox / LeiPmdir.pm

diff --git a/lib/PublicInbox/LeiPmdir.pm b/lib/PublicInbox/LeiPmdir.pm
index 5efb012e4e8c69ad146f52d59a862999e29da83e..aa9ce713507a2448a1e50ced1ccd544669f8d756 100644 (file)
--- a/lib/PublicInbox/LeiPmdir.pm
+++ b/lib/PublicInbox/LeiPmdir.pm
@@ -13,14 +13,14 @@ use parent qw(PublicInbox::IPC);
 sub new {
        my ($cls, $lei, $ipt) = @_;
        my $self = bless { -wq_ident => 'lei Maildir worker' }, $cls;
-       my $jobs = $lei->{opt}->{jobs};
+       my $jobs = $lei->{opt}->{jobs} // '';
        $jobs =~ /\A[0-9]+,([0-9]+)\z/ and $jobs = $1;
-       my $nproc = $jobs // do {
-               # untested with >=4 CPUs, though I suspect I/O latency
+       my $nproc = $jobs || do {
+               # barely tested with >=4 CPUs, though I suspect I/O latency
                # of SATA SSD storage will make >=4 processes unnecessary,
                # here.  NVMe users may wish to use '-j'
                my $n = $self->detect_nproc;
-               $n = 4 if $n > 4;
+               $n = $n > 4 ? 4 : $n;
        };
        my ($op_c, $ops) = $lei->workers_start($self, $nproc,
                undef, { ipt => $ipt }); # LeiInput subclass
@@ -42,13 +42,13 @@ sub ipc_atfork_child {
 }
 
 sub each_mdir_fn { # maildir_each_file callback
-       my ($f, $self, @args) = @_;
-       $self->wq_io_do('mdir_iter', [], $f, @args);
+       my ($f, $fl, $self, @args) = @_;
+       $self->wq_io_do('mdir_iter', [], $f, $fl, @args);
 }
 
 sub mdir_iter { # via wq_io_do
-       my ($self, $f, @args) = @_;
-       $self->{ipt}->pmdir_cb($f, @args);
+       my ($self, $f, $fl, @args) = @_;
+       $self->{ipt}->pmdir_cb($f, $fl, @args);
 }
 
 sub pmd_done_wait {