From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 252F71F9F8 for ; Sun, 9 Jun 2019 02:51:49 +0000 (UTC) From: "Eric Wong (Contractor, The Linux Foundation)" To: meta@public-inbox.org Subject: [PATCH 08/11] AdminEdit: move editability checks from -purge Date: Sun, 9 Jun 2019 02:51:44 +0000 Message-Id: <20190609025147.24966-9-e@80x24.org> In-Reply-To: <20190609025147.24966-1-e@80x24.org> References: <20190609025147.24966-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We'll be reusing the same logic for -edit --- lib/PublicInbox/AdminEdit.pm | 39 ++++++++++++++++++++++++++++++++++++ script/public-inbox-purge | 35 +------------------------------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/lib/PublicInbox/AdminEdit.pm b/lib/PublicInbox/AdminEdit.pm index 109a99f..b27c831 100644 --- a/lib/PublicInbox/AdminEdit.pm +++ b/lib/PublicInbox/AdminEdit.pm @@ -8,4 +8,43 @@ use warnings; use PublicInbox::Admin; our @OPT = qw(all force|f verbose|v!); +sub check_editable ($) { + my ($ibxs) = @_; + + 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'; + } + } +} + 1; diff --git a/script/public-inbox-purge b/script/public-inbox-purge index dc7f89d..846557c 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; -- EW