use Cwd 'abs_path';
use base qw(Exporter);
our @EXPORT_OK = qw(resolve_repo_dir);
-my $CFG; # all the admin stuff is a singleton
require PublicInbox::Config;
sub resolve_repo_dir {
local $/;
<$fh>;
};
- close $fh or die "error in $cmd: $!\n";
+ close $fh or die "error in $cmd (cwd:$cd): $!\n";
chomp $dir;
$$ver = 1 if $ver;
return abs_path($cd) if ($dir eq '.' && defined $cd);
$l = $m;
} elsif ($m ne '') {
warn <<"";
-$ibx->{mainrepo} has unexpected indexlevel in Xapian: $m
+$ibx->{inboxdir} has unexpected indexlevel in Xapian: $m
}
}
PublicInbox::Inbox->new({
name => $name,
address => [ "$name\@example.com" ],
- mainrepo => $dir,
+ inboxdir => $dir,
# TODO: consumers may want to warn on this:
#-unconfigured => 1,
});
}
-sub config () { $CFG //= eval { PublicInbox::Config->new } }
-
-sub resolve_inboxes ($;$) {
- my ($argv, $opt) = @_;
+sub resolve_inboxes ($;$$) {
+ my ($argv, $opt, $cfg) = @_;
require PublicInbox::Inbox;
$opt ||= {};
- my $cfg = config();
+ $cfg //= eval { PublicInbox::Config->new };
if ($opt->{all}) {
my $cfgfile = PublicInbox::Config::default_file();
$cfg or die "--all specified, but $cfgfile not readable\n";
$cfg->each_inbox(sub {
my ($ibx) = @_;
$ibx->{version} ||= 1;
- $dir2ibx{abs_path($ibx->{mainrepo})} = $ibx;
+ my $path = abs_path($ibx->{inboxdir});
+ if (defined($path)) {
+ $dir2ibx{$path} = $ibx;
+ } else {
+ warn <<EOF;
+W: $ibx->{name} $ibx->{inboxdir}: $!
+EOF
+ }
});
}
if ($opt->{all}) {
}
# TODO: make Devel::Peek optional, only used for daemon
-my @base_mod = qw(Email::MIME Date::Parse Devel::Peek);
+my @base_mod = qw(Email::MIME Devel::Peek);
my @over_mod = qw(DBD::SQLite DBI);
my %mod_groups = (
-index => [ @base_mod, @over_mod ],
}
sub index_inbox {
- my ($ibx, $opt) = @_;
+ my ($ibx, $im, $opt) = @_;
my $jobs = delete $opt->{jobs} if $opt;
if (ref($ibx) && ($ibx->{version} || 1) == 2) {
eval { require PublicInbox::V2Writable };
die "v2 requirements not met: $@\n" if $@;
- my $v2w = eval { $ibx->importer(0) } || eval {
+ my $v2w = $im // eval { $ibx->importer(0) } || eval {
PublicInbox::V2Writable->new($ibx, {nproc=>$jobs});
};
if (defined $jobs) {
if ($jobs == 0) {
$v2w->{parallel} = 0;
} else {
- my $n = $v2w->{partitions};
- if ($jobs != ($n + 1)) {
+ my $n = $v2w->{shards};
+ if ($jobs != ($n + 1) && !$opt->{reshard}) {
warn
-"Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
+"Unable to respect --jobs=$jobs, inbox was created with $n shards\n";
}
}
}