inbox: add ->version method

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

diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index 116f423b74e6f4c5659a756cae7279dbc500b4c2..5b2aeed34a1647fbf408800f7e34e12f87f47661 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
@@ -7,8 +7,7 @@ use strict;
 use warnings;
 use base qw(PublicInbox::Inbox);
 use PublicInbox::Import;
-use PublicInbox::Filter::Base;
-*REJECT = *PublicInbox::Filter::Base::REJECT;
+use PublicInbox::Filter::Base qw(REJECT);
 
 use constant {
        PERM_UMASK => 0,
@@ -25,42 +24,46 @@ sub new {
        # TODO: maybe stop supporting this
        if ($creat_opt) { # for { nproc => $N }
                $self->{-creat_opt} = $creat_opt;
-               init_inbox($self) if ($self->{version} || 1) == 1;
+               init_inbox($self) if $self->version == 1;
        }
        $self;
 }
 
+sub assert_usable_dir {
+       my ($self) = @_;
+       my $dir = $self->{inboxdir};
+       return $dir if defined($dir) && $dir ne '';
+       die "no inboxdir defined for $self->{name}\n";
+}
+
 sub init_inbox {
-       my ($self, $partitions, $skip_epoch, $skip_artnum) = @_;
+       my ($self, $shards, $skip_epoch, $skip_artnum) = @_;
        # TODO: honor skip_artnum
-       my $v = $self->{version} || 1;
-       if ($v == 1) {
-               my $dir = $self->{mainrepo} or die "no mainrepo in inbox\n";
+       if ($self->version == 1) {
+               my $dir = assert_usable_dir($self);
                PublicInbox::Import::init_bare($dir);
        } else {
                my $v2w = importer($self);
-               $v2w->init_inbox($partitions, $skip_epoch, $skip_artnum);
+               $v2w->init_inbox($shards, $skip_epoch, $skip_artnum);
        }
 }
 
 sub importer {
        my ($self, $parallel) = @_;
-       $self->{-importer} ||= do {
-               my $v = $self->{version} || 1;
-               if ($v == 2) {
-                       eval { require PublicInbox::V2Writable };
-                       die "v2 not supported: $@\n" if $@;
-                       my $opt = $self->{-creat_opt};
-                       my $v2w = PublicInbox::V2Writable->new($self, $opt);
-                       $v2w->{parallel} = $parallel;
-                       $v2w;
-               } elsif ($v == 1) {
-                       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";
-               }
+       my $v = $self->version;
+       if ($v == 2) {
+               eval { require PublicInbox::V2Writable };
+               die "v2 not supported: $@\n" if $@;
+               my $opt = $self->{-creat_opt};
+               my $v2w = PublicInbox::V2Writable->new($self, $opt);
+               $v2w->{parallel} = $parallel;
+               $v2w;
+       } elsif ($v == 1) {
+               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";
        }
 }
 
@@ -71,7 +74,7 @@ sub filter {
                # 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}) {
+               if ($im && $self->version >= 2 && $self->{altid}) {
                        $im->done;
                }
 
@@ -134,7 +137,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;
@@ -252,4 +255,8 @@ sub umask_prepare {
        $self->{umask} = $umask;
 }
 
+sub cleanup ($) {
+       delete @{$_[0]}{qw(over mm git search)};
+}
+
 1;