X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=439da15708645c792c0d485818b5611e89a2bc11;hb=f8cc21f0064a34042d149f31097336919adf70d1;hp=53def9a7253d918f9a68db705baea8fd9fdfcffd;hpb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;p=public-inbox.git

diff --git a/script/public-inbox-index b/script/public-inbox-index
index 53def9a7..439da157 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,106 +1,36 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # Basic tool to create a Xapian search index for a git repository
 # configured for public-inbox.
 # Usage with libeatmydata <https://www.flamingspork.com/projects/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::Config;
-use PublicInbox::Admin qw(resolve_repo_dir);
+my $usage = "public-inbox-index INBOX_DIR";
+use PublicInbox::Admin;
+PublicInbox::Admin::require_or_die('-index');
 
-my $config = eval { PublicInbox::Config->new } || eval {
-	warn "public-inbox unconfigured for serving, indexing anyways...\n";
-	undef;
-};
-eval { require PublicInbox::SearchIdx };
-if ($@) {
-	print STDERR "Search::Xapian required for $0\n";
-	exit 1;
-}
-
-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());
-}
+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;
 
 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;
-	}
-});
-
-foreach my $dir (@dirs) {
-	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);
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV);
+PublicInbox::Admin::require_or_die('-index');
+usage() unless @ibxs;
+my $mods = {};
+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);
 }
 
-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::require_or_die(keys %$mods);
+PublicInbox::Admin::progress_prepare($opt);
+PublicInbox::Admin::index_inbox($_, $opt) for @ibxs;