X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-index;h=102381c390510bc086897638a16596c87d859d74;hb=7c5ac90b309bbe76468055e8a9289664ef2dfe37;hp=40187b35018f84d6cd86e18959455ce877be365f;hpb=666f1b8f5c7c76333df4e1296c1668abf04f210f;p=public-inbox.git

diff --git a/script/public-inbox-index b/script/public-inbox-index
index 40187b35..102381c3 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -13,26 +13,23 @@ my $usage = "public-inbox-index INBOX_DIR";
 use PublicInbox::Admin;
 PublicInbox::Admin::require_or_die('-index');
 
-my $opt = {};
-GetOptions($opt, qw(reindex jobs|j=i prune indexlevel|L=s))
+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 }
 
-# do we really care about this message?  It's annoying...
-my $warn = 'public-inbox unconfigured for serving, indexing anyways...';
-my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $warn);
+my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV);
 PublicInbox::Admin::require_or_die('-index');
-usage() unless @ibxs;
+unless (@ibxs) { print STDERR "Usage: $usage\n"; exit 1 }
 my $mods = {};
 foreach my $ibx (@ibxs) {
-	if (defined $opt->{indexlevel} && !defined($ibx->{indexlevel})) {
-		# XXX: users can shoot themselves in the foot, with this...
-		$ibx->{indexlevel} = $opt->{indexlevel};
-	}
+	# 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);
-PublicInbox::Admin::index_inbox($_, $opt) for @ibxs;
+PublicInbox::Admin::progress_prepare($opt);
+PublicInbox::Admin::index_inbox($_, undef, $opt) for @ibxs;