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 E475B1F9F7 for ; Sun, 9 Jun 2019 02:51:48 +0000 (UTC) From: "Eric Wong (Contractor, The Linux Foundation)" To: meta@public-inbox.org Subject: [PATCH 07/11] admin: beef up resolve_inboxes to handle purge options Date: Sun, 9 Jun 2019 02:51:43 +0000 Message-Id: <20190609025147.24966-8-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 using this in -edit, and maybe other admin-oriented tools for UI-consistency. --- lib/PublicInbox/Admin.pm | 65 +++++++++++++++++++++++++++++---------- script/public-inbox-purge | 53 +++---------------------------- 2 files changed, 52 insertions(+), 66 deletions(-) diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm index 419cb35..cebd144 100644 --- a/lib/PublicInbox/Admin.pm +++ b/lib/PublicInbox/Admin.pm @@ -66,33 +66,64 @@ $ibx->{mainrepo} has unexpected indexlevel in Xapian: $m $l; } -sub resolve_inboxes { - my ($argv) = @_; +sub unconfigured_ibx ($$) { + my ($dir, $i) = @_; + my $name = "unconfigured-$i"; + PublicInbox::Inbox->new({ + name => $name, + address => [ "$name\@example.com" ], + mainrepo => $dir, + # TODO: consumers may want to warn on this: + #-unconfigured => 1, + }); +} + +sub resolve_inboxes ($;$) { + my ($argv, $opt) = @_; require PublicInbox::Config; require PublicInbox::Inbox; + $opt ||= {}; - my @ibxs = map { resolve_repo_dir($_) } @$argv; - push(@ibxs, resolve_repo_dir()) unless @ibxs; + my $config = eval { PublicInbox::Config->new }; + if ($opt->{all}) { + my $cfgfile = PublicInbox::Config::default_file(); + $config or die "--all specified, but $cfgfile not readable\n"; + @$argv and die "--all specified, but directories specified\n"; + } + my $min_ver = $opt->{-min_inbox_version} || 0; + my (@old, @ibxs); my %dir2ibx; - if (my $config = eval { PublicInbox::Config->new }) { + if ($config) { $config->each_inbox(sub { my ($ibx) = @_; + $ibx->{version} ||= 1; $dir2ibx{abs_path($ibx->{mainrepo})} = $ibx; }); } - for my $i (0..$#ibxs) { - my $dir = $ibxs[$i]; - $ibxs[$i] = $dir2ibx{$dir} ||= do { - my $name = "unconfigured-$i"; - PublicInbox::Inbox->new({ - name => $name, - address => [ "$name\@example.com" ], - mainrepo => $dir, - # TODO: consumers may want to warn on this: - #-unconfigured => 1, - }); - }; + if ($opt->{all}) { + my @all = values %dir2ibx; + @all = grep { $_->{version} >= $min_ver } @all; + push @ibxs, @all; + } else { # directories specified on the command-line + my $i = 0; + my @dirs = @$argv; + push @dirs, '.' unless @dirs; + foreach (@dirs) { + my $v; + my $dir = resolve_repo_dir($_, \$v); + if ($v < $min_ver) { + push @old, $dir; + next; + } + my $ibx = $dir2ibx{$dir} ||= unconfigured_ibx($dir, $i); + $i++; + push @ibxs, $ibx; + } + } + if (@old) { + die "inboxes $min_ver inboxes not supported by $0\n\t", + join("\n\t", @old), "\n"; } @ibxs; } diff --git a/script/public-inbox-purge b/script/public-inbox-purge index d58a9ba..dc7f89d 100755 --- a/script/public-inbox-purge +++ b/script/public-inbox-purge @@ -10,64 +10,19 @@ use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev); use PublicInbox::AdminEdit; PublicInbox::Admin::check_require('-index'); require PublicInbox::Filter::Base; -require PublicInbox::Config; require PublicInbox::MIME; require PublicInbox::V2Writable; { no warnings 'once'; *REJECT = *PublicInbox::Filter::Base::REJECT } my $usage = "$0 [--all] [INBOX_DIRS] new }; -my $cfgfile = PublicInbox::Config::default_file(); -my $opt = { verbose => 1 }; +my $opt = { verbose => 1, all => 0, -min_inbox_version => 2 }; GetOptions($opt, @PublicInbox::AdminEdit::OPT) or die "bad command-line args\n$usage\n"; -# TODO: clean this up and share code with -index via ::Admin -my %dir2ibx; # ( path => Inbox object ) -my @inboxes; -$config and $config->each_inbox(sub { - my ($ibx) = @_; - push @inboxes, $ibx if $opt->{all} && $ibx->{version} != 1; - $dir2ibx{$ibx->{mainrepo}} = $ibx; -}); - -if ($opt->{all}) { - $config or die "--all specified, but $cfgfile not readable\n"; - @ARGV and die "--all specified, but directories specified\n"; -} else { - my @err; - my @dirs = scalar(@ARGV) ? @ARGV : ('.'); - my $u = 0; - - foreach my $dir (@dirs) { - my $v; - my $dir = PublicInbox::Admin::resolve_repo_dir($dir, \$v); - if ($v == 1) { - push @err, $dir; - next; - } - my $ibx = $dir2ibx{$dir} ||= do { - warn "$dir not configured in $cfgfile\n"; - $u++; - my $name = "unconfigured-$u"; - PublicInbox::Inbox->new({ - version => 2, - name => $name, - -primary_address => "$name\@example.com", - mainrepo => $dir, - }); - }; - push @inboxes, $ibx; - } - - if (@err) { - die "v1 inboxes currently not supported by -purge\n\t", - join("\n\t", @err), "\n"; - } -} +my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt); -foreach my $ibx (@inboxes) { +foreach my $ibx (@ibxs) { my $lvl = $ibx->{indexlevel}; if (defined $lvl) { PublicInbox::Admin::indexlevel_ok_or_die($lvl); @@ -105,7 +60,7 @@ my $data = do { local $/; scalar }; $data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s; my $n_purged = 0; -foreach my $ibx (@inboxes) { +foreach my $ibx (@ibxs) { my $mime = PublicInbox::MIME->new($data); my $v2w = PublicInbox::V2Writable->new($ibx, 0); -- EW