use strict;
use warnings;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use Cwd 'abs_path';
my $usage = "public-inbox-index REPO_DIR";
use PublicInbox::Config;
+use PublicInbox::Admin qw(resolve_repo_dir);
+
my $config = eval { PublicInbox::Config->new } || eval {
warn "public-inbox unconfigured for serving, indexing anyways...\n";
- {}
+ undef;
};
eval { require PublicInbox::SearchIdx };
if ($@) {
}
my $reindex;
-my %opts = ( '--reindex' => \$reindex );
+my $prune;
+my $jobs = undef;
+my $indexlevel;
+my %opts = (
+ '--reindex' => \$reindex,
+ '--jobs|j=i' => \$jobs,
+ '--prune' => \$prune,
+ 'L|indexlevel=s' => \$indexlevel,
+);
GetOptions(%opts) or die "bad command-line args\n$usage";
+die "--jobs must be positive\n" if defined $jobs && $jobs < 0;
my @dirs;
-sub resolve_repo_dir {
- my ($cd) = @_;
- my $prefix = defined $cd ? $cd : './';
-
- my @cmd = qw(git rev-parse --git-dir);
- my $cmd = join(' ', @cmd);
- my $pid = open my $fh, '-|';
- defined $pid or die "forking $cmd failed: $!\n";
- if ($pid == 0) {
- if (defined $cd) {
- chdir $cd or die "chdir $cd failed: $!\n";
- }
- exec @cmd;
- die "Failed to exec $cmd: $!\n";
- } else {
- my $dir = eval {
- local $/;
- <$fh>;
- };
- close $fh or die "error in $cmd: $!\n";
- chomp $dir;
- return abs_path($cd) if ($dir eq '.' && defined $cd);
- abs_path($dir);
- }
-}
-
if (@ARGV) {
@dirs = map { resolve_repo_dir($_) } @ARGV;
} else {
sub usage { print STDERR "Usage: $usage\n"; exit 1 }
usage() unless @dirs;
-foreach my $k (keys %$config) {
- $k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
- my $name = $1;
- my $v = $config->{$k};
+defined($config) and $config->each_inbox(sub {
+ my ($ibx) = @_;
+
for my $i (0..$#dirs) {
- next if $dirs[$i] ne $v;
- my $ibx = $config->lookup_name($name);
- $dirs[$i] = $ibx if $ibx;
+ next if $dirs[$i] ne $ibx->{mainrepo};
+ $dirs[$i] = $ibx;
}
-}
+});
foreach my $dir (@dirs) {
- index_dir($dir);
+ if (!ref($dir)) {
+ unless (-d $dir) {
+ die "$dir does not appear to be an inbox repository\n";
+ }
+ my $ibx = {
+ mainrepo => $dir,
+ name => 'unnamed',
+ indexlevel => $indexlevel,
+ version => -f "$dir/inbox.lock" ? 2 : 1,
+ };
+ $dir = PublicInbox::Inbox->new($ibx);
+ } elsif (defined $indexlevel && !defined($dir->{indexlevel})) {
+ # XXX: users can shoot themselves in the foot, with this...
+ $dir->{indexlevel} = $indexlevel;
+ }
+
+ index_inbox($dir);
}
-sub index_dir {
- my ($git_dir) = @_;
- if (!ref $git_dir && ! -d $git_dir) {
- die "$git_dir does not appear to be a git repository\n";
+sub index_inbox {
+ my ($repo) = @_;
+ if (ref($repo) && ($repo->{version} || 1) == 2) {
+ eval { require PublicInbox::V2Writable };
+ die "v2 requirements not met: $@\n" if $@;
+ my $v2w = eval {
+ PublicInbox::V2Writable->new($repo, {nproc=>$jobs});
+ };
+ if (defined $jobs) {
+ if ($jobs == 0) {
+ $v2w->{parallel} = 0;
+ } else {
+ my $n = $v2w->{partitions};
+ if ($jobs != ($n + 1)) {
+ warn
+"Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
+ }
+ }
+ }
+ local $SIG{__WARN__} = sub {
+ print STDERR $v2w->{current_info}, ': ', @_;
+ };
+ $v2w->index_sync({ reindex => $reindex, prune => $prune });
+ } else {
+ my $s = PublicInbox::SearchIdx->new($repo, 1);
+ $s->index_sync({ reindex => $reindex });
}
- my $s = PublicInbox::SearchIdx->new($git_dir, 1);
- $s->index_sync({ reindex => $reindex });
}