diff options
author | Eric Wong <e@80x24.org> | 2021-03-10 13:23:43 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-03-10 23:39:16 -0400 |
commit | 0c42d57cc29917b731d4a4918f9b2d666ee230e6 (patch) | |
tree | 814444e3df4896ae7b1ed055c18eb32162613218 /lib/PublicInbox | |
parent | 2bc961811c57bef3feef24244bf20546f3754d4f (diff) | |
download | public-inbox-0c42d57cc29917b731d4a4918f9b2d666ee230e6.tar.gz |
Having a one-off Maildir functionality in LeiStore doesn't seem worth the maintenance burden, especially given an upcoming change to skip trashed messages. I expect this will hurt performance slightly with extra IPC overhead for the socket copy, but "lei import" may eventually become rare or at least not hit messages redundantly.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/LeiImport.pm | 8 | ||||
-rw-r--r-- | lib/PublicInbox/LeiStore.pm | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 23cecd53..815788b3 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -147,9 +147,9 @@ error reading $input: $! $lei->child_error(1 << 8, "$input: $@") if $@; } -sub _import_maildir { # maildir_each_file cb - my ($f, $sto, $set_kw) = @_; - $sto->ipc_do('set_eml_from_maildir', $f, $set_kw); +sub _import_maildir { # maildir_each_eml cb + my ($f, $kw, $eml, $sto, $set_kw) = @_; + $sto->ipc_do('set_eml', $eml, $set_kw ? @$kw : ()); } sub _import_net { # imap_each, nntp_each cb @@ -181,7 +181,7 @@ sub import_path_url { return $lei->fail(<<EOM) if $ifmt && $ifmt ne 'maildir'; $input appears to a be a maildir, not $ifmt EOM - PublicInbox::MdirReader::maildir_each_file($input, + PublicInbox::MdirReader::maildir_each_eml($input, \&_import_maildir, $lei->{sto}, $lei->{opt}->{kw}); } else { diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm index 92c29100..6ace2ad1 100644 --- a/lib/PublicInbox/LeiStore.pm +++ b/lib/PublicInbox/LeiStore.pm @@ -213,12 +213,6 @@ sub set_eml { add_eml($self, $eml, @kw) // set_eml_keywords($self, $eml, @kw); } -sub set_eml_from_maildir { - my ($self, $f, $set_kw) = @_; - my $eml = eml_from_path($f) or return; - set_eml($self, $eml, $set_kw ? maildir_keywords($f) : ()); -} - sub checkpoint { my ($self, $wait) = @_; if (my $im = $self->{im}) { |