inboxwritable: import_maildir uses maildir_path_load

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

diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index f00141d286e42a62e1f7f3d00901ea72d5fcf4c3..ab7b0ed5a7ba3fa82e62de4bcbe6704af70a0c3c 100644 (file)
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Extends read-only Inbox for writing
@@ -35,7 +35,7 @@ sub init_inbox {
        # TODO: honor skip_artnum
        my $v = $self->{version} || 1;
        if ($v == 1) {
-               my $dir = $self->{mainrepo} or die "no mainrepo in inbox\n";
+               my $dir = $self->{inboxdir} or die "no inboxdir in inbox\n";
                PublicInbox::Import::init_bare($dir);
        } else {
                my $v2w = importer($self);
@@ -134,7 +134,7 @@ sub import_maildir {
                opendir my $dh, "$dir/$sub" or die "opendir $dir/$sub: $!\n";
                while (defined(my $fn = readdir($dh))) {
                        next unless is_maildir_basename($fn);
-                       my $mime = maildir_file_load("$dir/$fn") or next;
+                       my $mime = maildir_path_load("$dir/$fn") or next;
 
                        if (my $filter = $self->filter($im)) {
                                my $ret = $filter->scrub($mime) or return;