admin: move index_inbox over

We will be reindexing after copydatabase

2 files changed, 39 insertions, 46 deletions

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 27848209..94f47abb 100644
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -135,4 +135,36 @@ invalid indexlevel=$indexlevel (must be `basic', `medium', or `full')
         die missing_mod_msg($err) ." required for indexlevel=$indexlevel\n";
 }
 
+sub index_inbox {
+        my ($ibx, $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 {
+                        PublicInbox::V2Writable->new($ibx, {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";
+                                }
+                        }
+                }
+                my $warn_cb = $SIG{__WARN__} || sub { print STDERR @_ };
+                local $SIG{__WARN__} = sub {
+                        $warn_cb->($v2w->{current_info}, ': ', @_);
+                };
+                $v2w->index_sync($opt);
+        } else {
+                require PublicInbox::SearchIdx;
+                my $s = PublicInbox::SearchIdx->new($ibx, 1);
+                $s->index_sync($opt);
+        }
+}
+
 1;
diff --git a/script/public-inbox-index b/script/public-inbox-index
index 9399c272..b6e30528 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -13,18 +13,10 @@ my $usage = "public-inbox-index REPO_DIR";
 use PublicInbox::Admin;
 PublicInbox::Admin::require_or_die('-index');
 
-my $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 $opt = {};
+GetOptions($opt, qw(reindex jobs|j=i prune indexlevel|L=s))
+        or die "bad command-line args\n$usage";
+die "--jobs must be positive\n" if defined $opt->{jobs} && $opt->{jobs} <= 0;
 
 sub usage { print STDERR "Usage: $usage\n"; exit 1 }
 
@@ -35,43 +27,12 @@ PublicInbox::Admin::require_or_die('-index');
 usage() unless @ibxs;
 my $mods = {};
 foreach my $ibx (@ibxs) {
-        if (defined $indexlevel && !defined($ibx->{indexlevel})) {
+        if (defined $opt->{indexlevel} && !defined($ibx->{indexlevel})) {
                 # XXX: users can shoot themselves in the foot, with this...
-                $ibx->{indexlevel} = $indexlevel;
+                $ibx->{indexlevel} = $opt->{indexlevel};
         }
         PublicInbox::Admin::scan_ibx_modules($mods, $ibx);
 }
 
 PublicInbox::Admin::require_or_die(keys %$mods);
-
-require PublicInbox::SearchIdx;
-index_inbox($_) for @ibxs;
-
-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 });
-        }
-}
+PublicInbox::Admin::index_inbox($_, $opt) for @ibxs;