X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-purge;h=82a63b80265110b11e5ee3826ea7827495ff29cf;hb=256b3566e4d57a64bb349a7b896da10381a2a363;hp=846557cab47b6d1c235222fbc0bf345c93e69269;hpb=455a1c0ef0519b2048c34d2fb31c9e9adbe3f507;p=public-inbox.git
diff --git a/script/public-inbox-purge b/script/public-inbox-purge
index 846557ca..82a63b80 100755
--- a/script/public-inbox-purge
+++ b/script/public-inbox-purge
@@ -1,5 +1,5 @@
#!/usr/bin/perl -w
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
#
# Used for purging messages entirely from a public-inbox. Currently
@@ -9,12 +9,10 @@ use warnings;
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::MIME;
+use PublicInbox::Filter::Base qw(REJECT);
+use PublicInbox::Eml;
require PublicInbox::V2Writable;
-{ no warnings 'once'; *REJECT = *PublicInbox::Filter::Base::REJECT }
-
my $usage = "$0 [--all] [INBOX_DIRS] 1, all => 0, -min_inbox_version => 2 };
GetOptions($opt, @PublicInbox::AdminEdit::OPT) or
@@ -23,12 +21,12 @@ GetOptions($opt, @PublicInbox::AdminEdit::OPT) or
my @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt);
PublicInbox::AdminEdit::check_editable(\@ibxs);
-my $data = do { local $/; scalar };
+my $data = do { local $/; };
$data =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
my $n_purged = 0;
foreach my $ibx (@ibxs) {
- my $mime = PublicInbox::MIME->new($data);
+ my $mime = PublicInbox::Eml->new($data);
my $v2w = PublicInbox::V2Writable->new($ibx, 0);
my $commits = $v2w->purge($mime) || [];
@@ -45,12 +43,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;
}