From: "Eric Wong (Contractor, The Linux Foundation)" <e@80x24.org>
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 [thread overview]
Message-ID: <20190609025147.24966-8-e@80x24.org> (raw)
In-Reply-To: <20190609025147.24966-1-e@80x24.org>
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] </path/to/message";
-my $config = eval { PublicInbox::Config->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 <STDIN> };
$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
next prev parent reply other threads:[~2019-06-09 2:51 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-09 2:51 [PATCH 00/11] v2: implement message editing Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 01/11] v2writable: consolidate overview and indexing call Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 02/11] import: extract_author_info becomes extract_commit_info Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 03/11] import: switch to "replace_oids" interface for purge Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 04/11] v2writable: implement ->replace call Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 05/11] admin: remove warning arg for unconfigured inboxes Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 06/11] purge: start moving common options to AdminEdit module Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` Eric Wong (Contractor, The Linux Foundation) [this message]
2019-06-09 2:51 ` [PATCH 08/11] AdminEdit: move editability checks from -purge Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 09/11] admin: expose ->config Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 10/11] doc: document the --prune option for -index Eric Wong (Contractor, The Linux Foundation)
2019-06-09 2:51 ` [PATCH 11/11] edit: new tool to perform edits Eric Wong (Contractor, The Linux Foundation)
2019-06-10 16:06 ` Konstantin Ryabitsev
2019-06-10 18:02 ` Eric Wong
2019-06-13 8:07 ` Eric Wong
2019-06-10 15:06 ` [PATCH 00/11] v2: implement message editing Konstantin Ryabitsev
2019-06-10 15:40 ` Eric Wong
2019-06-10 17:56 ` [PATCH 12/11] edit|purge: improve output on rewrites Eric Wong
2019-06-10 18:57 ` [PATCH 00/11] v2: implement message editing Konstantin Ryabitsev
2019-06-10 19:29 ` Eric Wong
2019-06-10 19:40 ` Konstantin Ryabitsev
2019-06-10 22:03 ` [WIP] v2writable: support INBOX_DEBUG=replace Eric Wong
2019-06-10 22:13 ` Konstantin Ryabitsev
2019-06-10 23:12 ` [WIP] add more debug tracing around idx_init Eric Wong
2019-06-11 15:33 ` Konstantin Ryabitsev
2019-06-11 18:43 ` [WIP] v2writable: support INBOX_DEBUG=replace Eric Wong
2019-06-11 21:06 ` [PATCH 00/11] v2: implement message editing Konstantin Ryabitsev
2019-06-12 0:18 ` [PATCH] searchidx: improve error message when Xapian fails Eric Wong
2019-06-10 18:17 ` [PATCH 13/11] edit: drop unwanted headers before noop check Eric Wong (Contractor, The Linux Foundation)
2019-06-10 21:58 ` [PATCH 14/11] v2writable: replace: kill git processes before reindexing Eric Wong (Contractor, The Linux Foundation)
2019-06-12 0:25 ` [PATCH 15/11] edit: unlink temporary file when done Eric Wong (Contractor, The Linux Foundation)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190609025147.24966-8-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).