spawn: allow passing GLOB handles for redirects

[public-inbox.git] / lib / PublicInbox / Admin.pm

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index e9fb5d6f1d53b42043ff6393d014b446aa16e250..5a3554cfe460c9efb8189f93422fc90a9a5efe9b 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -9,7 +9,6 @@ use warnings;
 use Cwd 'abs_path';
 use base qw(Exporter);
 our @EXPORT_OK = qw(resolve_repo_dir);
-my $CFG; # all the admin stuff is a singleton
 require PublicInbox::Config;
 
 sub resolve_repo_dir {
@@ -80,14 +79,12 @@ sub unconfigured_ibx ($$) {
        });
 }
 
-sub config () { $CFG //= eval { PublicInbox::Config->new } }
-
-sub resolve_inboxes ($;$) {
-       my ($argv, $opt) = @_;
+sub resolve_inboxes ($;$$) {
+       my ($argv, $opt, $cfg) = @_;
        require PublicInbox::Inbox;
        $opt ||= {};
 
-       my $cfg = config();
+       $cfg //= eval { PublicInbox::Config->new };
        if ($opt->{all}) {
                my $cfgfile = PublicInbox::Config::default_file();
                $cfg or die "--all specified, but $cfgfile not readable\n";
@@ -139,7 +136,7 @@ EOF
 }
 
 # TODO: make Devel::Peek optional, only used for daemon
-my @base_mod = qw(Email::MIME Date::Parse Devel::Peek);
+my @base_mod = qw(Email::MIME Devel::Peek);
 my @over_mod = qw(DBD::SQLite DBI);
 my %mod_groups = (
        -index => [ @base_mod, @over_mod ],
@@ -162,6 +159,10 @@ sub check_require {
        while (my $mod = shift @mods) {
                if (my $groups = $mod_groups{$mod}) {
                        push @mods, @$groups;
+               } elsif ($mod eq 'Search::Xapian') {
+                       require PublicInbox::Search;
+                       PublicInbox::Search::load_xapian() or
+                               $err->{'Search::Xapian || Xapian'} = $@;
                } else {
                        eval "require $mod";
                        $err->{$mod} = $@ if $@;
@@ -199,12 +200,12 @@ invalid indexlevel=$indexlevel (must be `basic', `medium', or `full')
 }
 
 sub index_inbox {
-       my ($ibx, $opt) = @_;
+       my ($ibx, $im, $opt) = @_;
        my $jobs = delete $opt->{jobs} if $opt;
        if (ref($ibx) && ($ibx->{version} || 1) == 2) {
                eval { require PublicInbox::V2Writable };
                die "v2 requirements not met: $@\n" if $@;
-               my $v2w = eval { $ibx->importer(0) } || eval {
+               my $v2w = $im // eval { $ibx->importer(0) } || eval {
                        PublicInbox::V2Writable->new($ibx, {nproc=>$jobs});
                };
                if (defined $jobs) {
@@ -240,8 +241,7 @@ sub progress_prepare ($) {
        if ($opt->{quiet}) {
                open my $null, '>', '/dev/null' or
                        die "failed to open /dev/null: $!\n";
-               $opt->{1} = fileno($null); # suitable for spawn() redirect
-               $opt->{-dev_null} = $null;
+               $opt->{1} = $null; # suitable for spawn() redirect
        } else {
                $opt->{verbose} ||= 1;
                $opt->{-progress} = sub { print STDERR @_ };