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 {
$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;
- my $path = abs_path($ibx->{mainrepo});
+ my $path = abs_path($ibx->{inboxdir});
if (defined($path)) {
$dir2ibx{$path} = $ibx;
} else {
warn <<EOF;
-W: $ibx->{name} $ibx->{mainrepo}: $!
+W: $ibx->{name} $ibx->{inboxdir}: $!
EOF
}
});
}
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) {