From d537fa4148134fe45595305a7398895682f43c96 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 23 May 2019 09:36:44 +0000 Subject: admin: hoist out resolve_inboxes for -compact and -index Both of these index-affecting commands should work similarly on the command-line. public-inbox-index no longer complains about unconfigured ~/.public-inbox/config; but often I found myself being annoyed by that, anyways... --- script/public-inbox-compact | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-) (limited to 'script/public-inbox-compact') diff --git a/script/public-inbox-compact b/script/public-inbox-compact index 4aa6273d..709fb92a 100755 --- a/script/public-inbox-compact +++ b/script/public-inbox-compact @@ -1,35 +1,16 @@ #!/usr/bin/perl -w -# Copyright (C) 2018 all contributors +# Copyright (C) 2018-2019 all contributors # License: AGPL-3.0+ use strict; use warnings; -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; +use PublicInbox::Admin; +PublicInbox::Admin::require_or_die('-index'); 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 @ibxs = PublicInbox::Admin::resolve_inboxes(\@ARGV) or die $usage; +foreach (@ibxs) { + my $ibx = PublicInbox::InboxWritable->new($_); + # we rely on --no-renumber to keep docids synched to NNTP + PublicInbox::Xapcmd::run($ibx, [qw(xapian-compact --no-renumber)]); } -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); -} -$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)]); -- cgit v1.2.3-24-ge0c7