X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=102381c390510bc086897638a16596c87d859d74;hb=d62d98b9a7f502da65673f0b83a6d06312c060d9;hp=1debbaacc27881fe9020ce1c3fa26d3055f98025;hpb=84e2b6ab9805b93174c5387740bea592064c80ea;p=public-inbox.git

diff --git a/script/public-inbox-index b/script/public-inbox-index
index 1debbaac..102381c3 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,88 +1,35 @@
 #!/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);
-use Cwd 'abs_path';
-my $usage = "public-inbox-index REPO_DIR";
-use PublicInbox::Config;
-my $config = eval { PublicInbox::Config->new } || eval {
-	warn "public-inbox unconfigured for serving, indexing anyways...\n";
-	{}
-};
-eval { require PublicInbox::SearchIdx };
-if ($@) {
-	print STDERR "Search::Xapian required for $0\n";
-	exit 1;
+my $usage = "public-inbox-index INBOX_DIR";
+use PublicInbox::Admin;
+PublicInbox::Admin::require_or_die('-index');
+
+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 @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 $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);
 }
 
-my $reindex;
-my %opts = ( '--reindex' => \$reindex );
-GetOptions(%opts) or die "bad command-line args\n$usage";
-
-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 {
-	@dirs = (resolve_repo_dir());
-}
-
-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};
-	for my $i (0..$#dirs) {
-		next if $dirs[$i] ne $v;
-		my $ibx = $config->lookup_name($name);
-		$dirs[$i] = $ibx if $ibx;
-	}
-}
-
-foreach my $dir (@dirs) {
-	index_dir($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";
-	}
-	my $s = PublicInbox::SearchIdx->new($git_dir, 1);
-	$s->index_sync({ reindex => $reindex });
-}
+PublicInbox::Admin::require_or_die(keys %$mods);
+PublicInbox::Admin::progress_prepare($opt);
+PublicInbox::Admin::index_inbox($_, undef, $opt) for @ibxs;