Merge remote-tracking branch 'origin/purge'

[public-inbox.git] / script / public-inbox-index

diff --git a/script/public-inbox-index b/script/public-inbox-index
index 2a7a524b34abee1765c3adc9288b64cf29dac78e..5adb6e741eff8f2578a780bd40738cd7c42ee7a6 100755 (executable)
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -9,12 +9,13 @@
 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 ($@) {
@@ -35,35 +36,6 @@ die "--jobs must be positive\n" if defined $jobs && $jobs < 0;
 
 my @dirs;
 
-sub resolve_repo_dir {
-       my ($cd) = @_;
-       my $prefix = defined $cd ? $cd : './';
-       if (-d $prefix && -f "$prefix/inbox.lock") { # v2
-               return abs_path($prefix);
-       }
-
-       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 {
@@ -73,16 +45,14 @@ if (@ARGV) {
 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) {
        if (!ref($dir) && -f "$dir/inbox.lock") { # v2
@@ -109,7 +79,7 @@ sub index_dir {
                                $v2w->{parallel} = 0;
                        } else {
                                my $n = $v2w->{partitions};
-                               if ($jobs != $n) {
+                               if ($jobs != ($n + 1)) {
                                        warn
 "Unable to respect --jobs=$jobs, inbox was created with $n partitions\n";
                                }