X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Fpublic-inbox-compact;h=80d0224bdcb060984bc973604c2aae5e4f854771;hb=d0bc58517c97c8982fdf42533297d96be9efb484;hp=4aa6273dc2435272c537c2ebceb27b4eefbeef5a;hpb=7e56f47848127b65979c786595244a552b164b3d;p=public-inbox.git

diff --git a/script/public-inbox-compact b/script/public-inbox-compact
index 4aa6273d..80d0224b 100755
--- a/script/public-inbox-compact
+++ b/script/public-inbox-compact
@@ -1,35 +1,42 @@
-#!/usr/bin/perl -w
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 2018-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use warnings;
+use v5.10.1;
 use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::Search;
-use PublicInbox::Config;
-use PublicInbox::InboxWritable;
-use Cwd 'abs_path';
-use PublicInbox::Xapcmd;
-my $usage = "Usage: public-inbox-compact REPO_DIR\n";
-my $dir = shift or die $usage;
-my $config = eval { PublicInbox::Config->new };
-my $ibx;
-$dir = abs_path($dir);
-if ($config) {
-	$config->each_inbox(sub {
-		$ibx = $_[0] if abs_path($_[0]->{mainrepo}) eq $dir
-	});
+my $opt = { compact => 1, -coarse_lock => 1, -eidx_ok => 1 };
+my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
+usage: public-inbox-compact <INBOX_DIR|EXTINDEX_DIR>
+
+  Compact Xapian DBs in an inbox
+
+options:
+
+  --all               index all configured inboxes
+  --jobs=NUM          control parallelization
+
+See public-inbox-compact(1) man page for full documentation.
+EOF
+GetOptions($opt, qw(all C=s@ help|h),
+	# compact options:
+	qw(jobs|j=i quiet|q blocksize|b=s no-full|n fuller|F),
+) or die $help;
+if ($opt->{help}) { print $help; exit 0 };
+
+require PublicInbox::Admin;
+PublicInbox::Admin::require_or_die('-index');
+PublicInbox::Admin::do_chdir(delete $opt->{C});
+PublicInbox::Admin::progress_prepare($opt);
+
+require PublicInbox::InboxWritable;
+require PublicInbox::Xapcmd;
+my $cfg = PublicInbox::Config->new;
+my ($ibxs, $eidxs) = PublicInbox::Admin::resolve_inboxes(\@ARGV, $opt, $cfg);
+unless ($ibxs) { print STDERR $help; exit 1 }
+for my $ibx (@$ibxs) {
+	$ibx = PublicInbox::InboxWritable->new($ibx);
+	PublicInbox::Xapcmd::run($ibx, 'compact', $opt);
 }
-unless ($ibx) {
-	warn "W: $dir not configured in ".
-		PublicInbox::Config::default_file() . "\n";
-	$ibx = {
-		mainrepo => $dir,
-		name => 'ignored',
-		address => [ 'old@example.com' ],
-	};
-	$ibx = PublicInbox::Inbox->new($ibx);
+for my $eidx (@$eidxs) {
+	PublicInbox::Xapcmd::run($eidx, 'compact', $opt);
 }
-$ibx = PublicInbox::InboxWritable->new($ibx);
-
-# we rely on --no-renumber to keep docids synched to NNTP
-PublicInbox::Xapcmd::run($ibx, [qw(xapian-compact --no-renumber)]);