X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FAdminEdit.pm;h=c8c3d3e8aeb44aae4c1202c273465fe9100d3267;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=169feba0dba9dbe8f3aa3778f4635e9a973118c6;hpb=3b508de80a200e9a32adbdc437434339187dde88;p=public-inbox.git

diff --git a/lib/PublicInbox/AdminEdit.pm b/lib/PublicInbox/AdminEdit.pm
index 169feba0..c8c3d3e8 100644
--- a/lib/PublicInbox/AdminEdit.pm
+++ b/lib/PublicInbox/AdminEdit.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # common stuff between -edit, -purge (and maybe -learn in the future)
@@ -6,7 +6,7 @@ package PublicInbox::AdminEdit;
 use strict;
 use warnings;
 use PublicInbox::Admin;
-our @OPT = qw(all force|f verbose|v!);
+our @OPT = qw(all force|f verbose|v! help|h);
 
 sub check_editable ($) {
 	my ($ibxs) = @_;
@@ -25,19 +25,20 @@ sub check_editable ($) {
 		# it's possible for a Xapian directory to exist,
 		# but Search::Xapian to go missing/broken.
 		# Make sure it's purged in that case:
-		$ibx->over or die "no over.sqlite3 in $ibx->{mainrepo}\n";
+		$ibx->over or die "no over.sqlite3 in $ibx->{inboxdir}\n";
 
-		# $ibx->{search} is populated by $ibx->over call
-		my $xdir_ro = $ibx->{search}->xdir(1);
-		my $npart = 0;
-		foreach my $part (<$xdir_ro/*>) {
-			if (-d $part && $part =~ m!/[0-9]+\z!) {
+		require PublicInbox::Search;
+		my $xdir_ro = PublicInbox::Search->new($ibx)->xdir(1);
+
+		my $nshard = 0;
+		foreach my $shard (<$xdir_ro/*>) {
+			if (-d $shard && $shard =~ m!/[0-9]+\z!) {
 				my $bytes = 0;
-				$bytes += -s $_ foreach glob("$part/*");
-				$npart++ if $bytes;
+				$bytes += -s $_ foreach glob("$shard/*");
+				$nshard++ if $bytes;
 			}
 		}
-		if ($npart) {
+		if ($nshard) {
 			PublicInbox::Admin::require_or_die('-search');
 		} else {
 			# somebody could "rm -r" all the Xapian directories;
@@ -51,7 +52,7 @@ sub check_editable ($) {
 # $rewrites = [ array commits keyed by epoch ]
 sub show_rewrites ($$$) {
 	my ($fh, $ibx, $rewrites) = @_;
-	print $fh "$ibx->{mainrepo}:";
+	print $fh "$ibx->{inboxdir}:";
 	if (scalar @$rewrites) {
 		my $epoch = -1;
 		my @out = map {;