lei: maildir: move shard support to MdirReader

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

diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index d4a9040f14358839ec7400b9d1c05244f3a32778..45d8cdc757356a0d9656abbf88f18c4624e6bc51 100644 (file)
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -153,8 +153,9 @@ sub import_maildir {
        }
        my $im = $self->importer(1);
        my @self = $self->filter($im) ? ($self) : ();
-       PublicInbox::MdirReader::maildir_each_file(\&_each_maildir_fn,
-                                               $im, @self);
+       require PublicInbox::MdirReader;
+       PublicInbox::MdirReader->new->maildir_each_file(\&_each_maildir_fn,
+                                                       $im, @self);
        $im->done;
 }
 
@@ -171,7 +172,7 @@ sub _mbox_eml_cb { # MboxReader->mbox* callback
 sub import_mbox {
        my ($self, $fh, $variant) = @_;
        require PublicInbox::MboxReader;
-       my $cb = PublicInbox::MboxReader->can($variant) or
+       my $cb = PublicInbox::MboxReader->reads($variant) or
                die "$variant not supported\n";
        my $im = $self->importer(1);
        $cb->(undef, $fh, \&_mbox_eml_cb, $im, $self->filter);