From 9c3009655a0d365154f1119803465afc11713e79 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 9 Jun 2021 07:47:48 +0000 Subject: mdir_reader: maildir_each_file: pass flags, skip Trash This is a slight behavior change for "lei q": Trashed (but not-yet-expunged) messages no longer get unlinked when --output is used without --augment. --- lib/PublicInbox/LeiImport.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'lib/PublicInbox/LeiImport.pm') diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index b0e7ba6b..cddd5619 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -30,11 +30,9 @@ sub input_mbox_cb { # MboxReader callback } sub pmdir_cb { # called via wq_io_do from LeiPmdir->each_mdir_fn - my ($self, $f, @args) = @_; + my ($self, $f, $fl) = @_; my ($folder, $bn) = ($f =~ m!\A(.+?)/(?:new|cur)/([^/]+)\z!) or die "BUG: $f was not from a Maildir?\n"; - my $fl = PublicInbox::MdirReader::maildir_basename_flags($bn); - return if index($fl, 'T') >= 0; # no Trashed messages my $kw = PublicInbox::MdirReader::flags2kw($fl); substr($folder, 0, 0) = 'maildir:'; # add prefix my $lms = $self->{-lms_ro}; -- cgit v1.2.3-24-ge0c7