X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInboxWritable.pm;h=ce979ea2bf8c65fe2f5f72ce16ef5d58515b5762;hb=b5ddcb3352ef31aeb03b4c4cbb04af3de34a4c4f;hp=4b22149f48c8f72bf0d0b562ff8ecdd9491c63d2;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index 4b22149f..ce979ea2 100644
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 all contributors
+# Copyright (C) 2018-2020 all contributors
# License: AGPL-3.0+
# 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,
@@ -20,22 +19,29 @@ use constant {
sub new {
my ($class, $ibx, $creat_opt) = @_;
+ return $ibx if ref($ibx) eq $class;
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;
+ 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, $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);
@@ -45,22 +51,20 @@ sub init_inbox {
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 +75,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 +138,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 +256,8 @@ sub umask_prepare {
$self->{umask} = $umask;
}
+sub cleanup ($) {
+ delete @{$_[0]}{qw(over mm git search)};
+}
+
1;