X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-purge;h=0705d170eae8806f706c75e246cd7594b2b20f20;hb=4821798351defce82c102e46d6f5f84f0cdc0e34;hp=dc7f89d951b27f737368527dc60b1dc767c45699;hpb=ce1391fcd1ad6027bbd8413f6c5277b5cc0445d3;p=public-inbox.git diff --git a/script/public-inbox-purge b/script/public-inbox-purge index dc7f89d9..0705d170 100755 --- a/script/public-inbox-purge +++ b/script/public-inbox-purge @@ -21,40 +21,7 @@ GetOptions($opt, @PublicInbox::AdminEdit::OPT) or die "bad command-line args\n$usage\n"; my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt); - -foreach my $ibx (@ibxs) { - my $lvl = $ibx->{indexlevel}; - if (defined $lvl) { - PublicInbox::Admin::indexlevel_ok_or_die($lvl); - next; - } - - # Undefined indexlevel, so `full'... - # Search::Xapian exists and the DB can be read, at least, fine - $ibx->search and next; - - # 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->{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!) { - my $bytes = 0; - $bytes += -s $_ foreach glob("$part/*"); - $npart++ if $bytes; - } - } - if ($npart) { - PublicInbox::Admin::require_or_die('-search'); - } else { - # somebody could "rm -r" all the Xapian directories; - # let them purge the overview, at least - $ibx->{indexlevel} ||= 'basic'; - } -} +PublicInbox::AdminEdit::check_editable(\@ibxs); my $data = do { local $/; scalar }; $data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; @@ -78,12 +45,7 @@ foreach my $ibx (@ibxs) { $v2w->done; if ($opt->{verbose}) { # should we consider this machine-parseable? - print "$ibx->{mainrepo}:"; - if (scalar @$commits) { - print join("\n\t", '', @$commits), "\n"; - } else { - print " NONE\n"; - } + PublicInbox::AdminEdit::show_rewrites(\*STDOUT, $ibx, $commits); } $n_purged += scalar @$commits; }