X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=102381c390510bc086897638a16596c87d859d74;hb=7c5ac90b309bbe76468055e8a9289664ef2dfe37;hp=cf001cc1504e219cfe384168acd6a19f0a5cf3a1;hpb=d0e8bfd866ed1e924e8d9f551939eecbea4920ef;p=public-inbox.git
diff --git a/script/public-inbox-index b/script/public-inbox-index
index cf001cc1..102381c3 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,110 +1,35 @@
#!/usr/bin/perl -w
-# Copyright (C) 2015-2018 all contributors
+# Copyright (C) 2015-2019 all contributors
# License: AGPL-3.0+
# Basic tool to create a Xapian search index for a git repository
# configured for public-inbox.
# Usage with libeatmydata
-# highly recommended: eatmydata public-inbox-index REPO_DIR
+# highly recommended: eatmydata public-inbox-index INBOX_DIR
use strict;
use warnings;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-my $usage = "public-inbox-index REPO_DIR";
-use PublicInbox::Admin qw(resolve_repo_dir);
+my $usage = "public-inbox-index INBOX_DIR";
+use PublicInbox::Admin;
PublicInbox::Admin::require_or_die('-index');
-require PublicInbox::Config;
-my $config = eval { PublicInbox::Config->new } || eval {
- warn "public-inbox unconfigured for serving, indexing anyways...\n";
- undef;
-};
+my $opt = { quiet => -1 };
+GetOptions($opt, qw(verbose|v+ 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;
-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 @dirs;
-
-if (@ARGV) {
- @dirs = map { resolve_repo_dir($_) } @ARGV;
-} else {
- @dirs = (resolve_repo_dir());
-}
-
-sub usage { print STDERR "Usage: $usage\n"; exit 1 }
-usage() unless @dirs;
-
-defined($config) and $config->each_inbox(sub {
- my ($ibx) = @_;
-
- for my $i (0..$#dirs) {
- next if $dirs[$i] ne $ibx->{mainrepo};
- $dirs[$i] = $ibx;
- }
-});
-
-my @inboxes;
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV);
+PublicInbox::Admin::require_or_die('-index');
+unless (@ibxs) { print STDERR "Usage: $usage\n"; exit 1 }
my $mods = {};
-
-foreach my $dir (@dirs) {
- my $ibx = $dir;
- if (!ref($ibx)) {
- unless (-d $dir) {
- die "$dir does not appear to be an inbox repository\n";
- }
- $ibx = PublicInbox::Inbox->new({
- mainrepo => $dir,
- name => 'unnamed',
- indexlevel => $indexlevel,
- version => -f "$dir/inbox.lock" ? 2 : 1,
- });
- } elsif (defined $indexlevel && !defined($ibx->{indexlevel})) {
- # XXX: users can shoot themselves in the foot, with this...
- $ibx->{indexlevel} = $indexlevel;
- }
- push @inboxes, $ibx;
+foreach my $ibx (@ibxs) {
+ # XXX: users can shoot themselves in the foot, with opt->{indexlevel}
+ $ibx->{indexlevel} //= $opt->{indexlevel} //
+ PublicInbox::Admin::detect_indexlevel($ibx);
PublicInbox::Admin::scan_ibx_modules($mods, $ibx);
}
PublicInbox::Admin::require_or_die(keys %$mods);
-
-require PublicInbox::SearchIdx;
-index_inbox($_) for @inboxes;
-
-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::progress_prepare($opt);
+PublicInbox::Admin::index_inbox($_, undef, $opt) for @ibxs;