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

diff --git a/script/public-inbox-index b/script/public-inbox-index
index b353093e..53def9a7 100755
--- a/script/public-inbox-index
+++ b/script/public-inbox-index
@@ -26,10 +26,12 @@ if ($@) {
 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;
@@ -55,18 +57,27 @@ defined($config) and $config->each_inbox(sub {
 });
 
 foreach my $dir (@dirs) {
-	if (!ref($dir) && -f "$dir/inbox.lock") { # v2
-		my $ibx = { mainrepo => $dir, name => 'unnamed' };
+	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_dir($dir);
+
+	index_inbox($dir);
 }
 
-sub index_dir {
+sub index_inbox {
 	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 $@;