purge: start moving common options to AdminEdit module

Editing and purging are similar operations involving history
rewrites, so there'll be common options and code between them.

diff --git a/MANIFEST b/MANIFEST
index 321da033bbf94de91e7ba6af409b9c9b4536bc39..dcf1a602aeffc76953d352a018a904c44ecb6541 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -68,6 +68,7 @@ examples/unsubscribe.psgi
 examples/varnish-4.vcl
 lib/PublicInbox/Address.pm
 lib/PublicInbox/Admin.pm
+lib/PublicInbox/AdminEdit.pm
 lib/PublicInbox/AltId.pm
 lib/PublicInbox/Cgit.pm
 lib/PublicInbox/Config.pm

diff --git a/lib/PublicInbox/AdminEdit.pm b/lib/PublicInbox/AdminEdit.pm
new file mode 100644 (file)
index 0000000..109a99f
--- /dev/null
+++ b/lib/PublicInbox/AdminEdit.pm
@@ -0,0 +1,11 @@
+# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# common stuff between -edit, -purge (and maybe -learn in the future)
+package PublicInbox::AdminEdit;
+use strict;
+use warnings;
+use PublicInbox::Admin;
+our @OPT = qw(all force|f verbose|v!);
+
+1;

diff --git a/script/public-inbox-purge b/script/public-inbox-purge
index 25e6cc9b782451a5774acde97d7454d70f8d5a3e..d58a9baae096b66cb439c71385bbc2be7e7f9f87 100755 (executable)
--- a/script/public-inbox-purge
+++ b/script/public-inbox-purge
@@ -7,7 +7,7 @@
 use strict;
 use warnings;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::Admin qw(resolve_repo_dir);
+use PublicInbox::AdminEdit;
 PublicInbox::Admin::check_require('-index');
 require PublicInbox::Filter::Base;
 require PublicInbox::Config;
@@ -19,25 +19,20 @@ require PublicInbox::V2Writable;
 my $usage = "$0 [--all] [INBOX_DIRS] </path/to/message";
 my $config = eval { PublicInbox::Config->new };
 my $cfgfile = PublicInbox::Config::default_file();
-my ($all, $force);
-my $verbose = 1;
-my %opts = (
-       'all' => \$all,
-       'force|f' => \$force,
-       'verbose|v!' => \$verbose,
-);
-GetOptions(%opts) or die "bad command-line args\n", $usage, "\n";
+my $opt = { verbose => 1 };
+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 $all && $ibx->{version} != 1;
+       push @inboxes, $ibx if $opt->{all} && $ibx->{version} != 1;
        $dir2ibx{$ibx->{mainrepo}} = $ibx;
 });
 
-if ($all) {
+if ($opt->{all}) {
        $config or die "--all specified, but $cfgfile not readable\n";
        @ARGV and die "--all specified, but directories specified\n";
 } else {
@@ -47,7 +42,7 @@ if ($all) {
 
        foreach my $dir (@dirs) {
                my $v;
-               my $dir = resolve_repo_dir($dir, \$v);
+               my $dir = PublicInbox::Admin::resolve_repo_dir($dir, \$v);
                if ($v == 1) {
                        push @err, $dir;
                        next;
@@ -127,7 +122,7 @@ foreach my $ibx (@inboxes) {
 
        $v2w->done;
 
-       if ($verbose) { # should we consider this machine-parseable?
+       if ($opt->{verbose}) { # should we consider this machine-parseable?
                print "$ibx->{mainrepo}:";
                if (scalar @$commits) {
                        print join("\n\t", '', @$commits), "\n";
@@ -139,7 +134,7 @@ foreach my $ibx (@inboxes) {
 }
 
 # behave like "rm -f"
-exit(0) if ($force || $n_purged);
+exit(0) if ($opt->{force} || $n_purged);
 
-warn "Not found\n" if $verbose;
+warn "Not found\n" if $opt->{verbose};
 exit(1);