X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=7def9964713a06472753d8df1704445f330f30b8;hb=b5ddcb3352ef31aeb03b4c4cbb04af3de34a4c4f;hp=73ad9bc4a1c08926f83ccfcde1857f863952e1ee;hpb=bd06b22c9fa498d72808cebfa3987718288ce5db;p=public-inbox.git

diff --git a/script/public-inbox-index b/script/public-inbox-index
index 73ad9bc4..7def9964 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,121 +1,48 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 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.
+# Basic tool to create a Xapian search index for a 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');
+use PublicInbox::Xapcmd;
+
+my $compact_opt;
+my $opt = { quiet => -1, compact => 0 };
+GetOptions($opt, qw(verbose|v+ reindex compact|c+ 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;
+
+if ($opt->{compact}) {
+	require PublicInbox::Xapcmd;
+	PublicInbox::Xapcmd::check_compact();
+	$compact_opt = { -coarse_lock => 1, compact => 1 };
 }
 
-my $reindex;
-my $prune;
-my $jobs = undef;
-my %opts = (
-	'--reindex' => \$reindex,
-	'--jobs|j=i' => \$jobs,
-	'--prune' => \$prune,
-);
-GetOptions(%opts) or die "bad command-line args\n$usage";
-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 {
-	@dirs = (resolve_repo_dir());
+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);
 }
 
-sub usage { print STDERR "Usage: $usage\n"; exit 1 }
-usage() unless @dirs;
-
-$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) && -f "$dir/inbox.lock") { # v2
-		my $ibx = { mainrepo => $dir, name => 'unnamed' };
-		$dir = PublicInbox::Inbox->new($ibx);
-	}
-	index_dir($dir);
-}
-
-sub index_dir {
-	my ($repo) = @_;
-	if (!ref $repo && ! -d $repo) {
-		die "$repo does not appear to be an inbox repository\n";
-	}
-	if (ref($repo) && ($repo->{version} || 1) == 2) {
-		eval { require PublicInbox::V2Writable };
-		die "v2 requirements not met: $@\n" if $@;
-		my $v2w = eval {
-			$jobs and local $ENV{NPROC} = $jobs;
-			PublicInbox::V2Writable->new($repo);
-		};
-		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";
-				}
-			}
-		}
-		$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);
+for my $ibx (@ibxs) {
+	$ibx = PublicInbox::InboxWritable->new($ibx);
+	if ($opt->{compact} >= 2) {
+		PublicInbox::Xapcmd::run($ibx, 'compact', $compact_opt);
 	}
+	PublicInbox::Admin::index_inbox($ibx, undef, $opt);
+	PublicInbox::Xapcmd::run($ibx, 'compact', $compact_opt) if $compact_opt;
 }