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 5c11a36c27631e4b82bed1de1dabe222e41ef484..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
@@ -19,35 +19,62 @@ use constant {
 };
 
 sub new {
-       my ($class, $ibx) = @_;
-       bless $ibx, $class;
+       my ($class, $ibx, $creat_opt) = @_;
+       my $self = bless $ibx, $class;
+
+       # TODO: maybe stop supporting this
+       if ($creat_opt) { # for { nproc => $N }
+               $self->{-creat_opt} = $creat_opt;
+               init_inbox($self) if ($self->{version} || 1) == 1;
+       }
+       $self;
+}
+
+sub init_inbox {
+       my ($self, $shards, $skip_epoch, $skip_artnum) = @_;
+       # TODO: honor skip_artnum
+       my $v = $self->{version} || 1;
+       if ($v == 1) {
+               my $dir = $self->{inboxdir} or die "no inboxdir in inbox\n";
+               PublicInbox::Import::init_bare($dir);
+       } else {
+               my $v2w = importer($self);
+               $v2w->init_inbox($shards, $skip_epoch, $skip_artnum);
+       }
 }
 
 sub importer {
        my ($self, $parallel) = @_;
-       $self->{-importer} ||= eval {
+       $self->{-importer} ||= do {
                my $v = $self->{version} || 1;
                if ($v == 2) {
                        eval { require PublicInbox::V2Writable };
                        die "v2 not supported: $@\n" if $@;
-                       my $v2w = PublicInbox::V2Writable->new($self);
+                       my $opt = $self->{-creat_opt};
+                       my $v2w = PublicInbox::V2Writable->new($self, $opt);
                        $v2w->{parallel} = $parallel;
                        $v2w;
                } elsif ($v == 1) {
-                       my $git = $self->git;
-                       my $name = $self->{name};
-                       my $addr = $self->{-primary_address};
-                       PublicInbox::Import->new($git, $name, $addr, $self);
+                       my @arg = (undef, undef, undef, $self);
+                       PublicInbox::Import->new(@arg);
                } else {
+                       $! = 78; # EX_CONFIG 5.3.5 local configuration error
                        die "unsupported inbox version: $v\n";
                }
        }
 }
 
 sub filter {
-       my ($self) = @_;
+       my ($self, $im) = @_;
        my $f = $self->{filter};
        if ($f && $f =~ /::/) {
+               # v2 keeps msgmap open, which causes conflicts for filters
+               # such as PublicInbox::Filter::RubyLang which overload msgmap
+               # for a predictable serial number.
+               if ($im && ($self->{version} || 1) >= 2 && $self->{altid}) {
+                       $im->done;
+               }
+
                my @args = (-inbox => $self);
                # basic line splitting, only
                # Perhaps we can have proper quote splitting one day...
@@ -99,7 +126,7 @@ sub maildir_path_load ($) {
 sub import_maildir {
        my ($self, $dir) = @_;
        my $im = $self->importer(1);
-       my $filter = $self->filter;
+
        foreach my $sub (qw(cur new tmp)) {
                -d "$dir/$sub" or die "$dir is not a Maildir (missing $sub)\n";
        }
@@ -107,8 +134,9 @@ 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;
-                       if ($filter) {
+                       my $mime = maildir_path_load("$dir/$fn") or next;
+
+                       if (my $filter = $self->filter($im)) {
                                my $ret = $filter->scrub($mime) or return;
                                return if $ret == REJECT();
                                $mime = $ret;
@@ -167,7 +195,6 @@ sub import_mbox {
 
 sub _read_git_config_perm {
        my ($self) = @_;
-       my @cmd = qw(config);
        chomp(my $perm = $self->git->qx('config', 'core.sharedRepository'));
        $perm;
 }
@@ -175,7 +202,7 @@ sub _read_git_config_perm {
 sub _git_config_perm {
        my $self = shift;
        my $perm = scalar @_ ? $_[0] : _read_git_config_perm($self);
-       return PERM_GROUP if (!defined($perm) || $perm eq '');
+       return PERM_UMASK if (!defined($perm) || $perm eq '');
        return PERM_UMASK if ($perm eq 'umask');
        return PERM_GROUP if ($perm eq 'group');
        if ($perm =~ /\A(?:all|world|everybody)\z/) {