X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=439da15708645c792c0d485818b5611e89a2bc11;hb=dde1b083571ed893cbb1990f01f9e11ed804cba5;hp=1431b99e22af1d0e044de5a0c4201f4c4db9b496;hpb=58a5bb3e18901237b1ca34ef8f03f696be27d305;p=public-inbox.git
diff --git a/script/public-inbox-index b/script/public-inbox-index
index 1431b99e..439da157 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -1,83 +1,36 @@
#!/usr/bin/perl -w
-# Copyright (C) 2015 all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# 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 GIT_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 GIT_DIR";
-use PublicInbox::Config;
-my $config = PublicInbox::Config->new;
-eval { require PublicInbox::SearchIdx };
-if ($@) {
- print STDERR "Search::Xapian required for $0\n";
- exit 1;
-}
-
-my $reindex;
-my %opts = ( '--reindex' => \$reindex );
-GetOptions(%opts) or die "bad command-line args\n$usage";
+my $usage = "public-inbox-index INBOX_DIR";
+use PublicInbox::Admin;
+PublicInbox::Admin::require_or_die('-index');
-my @dirs;
-
-sub resolve_git_dir {
- my ($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_git_dir($_) } @ARGV;
-} else {
- @dirs = (resolve_git_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;
-
-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);
+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_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($_, $opt) for @ibxs;