Date::Parse is now optional

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

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index dc70d690b8f4cd25b5bb5f3f0d056102594df961..3d0d80b92003347771b135cbeab47c6444d510c5 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 {
@@ -35,7 +34,7 @@ sub resolve_repo_dir {
                        local $/;
                        <$fh>;
                };
-               close $fh or die "error in $cmd: $!\n";
+               close $fh or die "error in $cmd (cwd:$cd): $!\n";
                chomp $dir;
                $$ver = 1 if $ver;
                return abs_path($cd) if ($dir eq '.' && defined $cd);
@@ -61,7 +60,7 @@ sub detect_indexlevel ($) {
                        $l = $m;
                } elsif ($m ne '') {
                        warn <<"";
-$ibx->{mainrepo} has unexpected indexlevel in Xapian: $m
+$ibx->{inboxdir} has unexpected indexlevel in Xapian: $m
 
                }
        }
@@ -74,20 +73,18 @@ sub unconfigured_ibx ($$) {
        PublicInbox::Inbox->new({
                name => $name,
                address => [ "$name\@example.com" ],
-               mainrepo => $dir,
+               inboxdir => $dir,
                # TODO: consumers may want to warn on this:
                #-unconfigured => 1,
        });
 }
 
-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";
@@ -101,12 +98,12 @@ sub resolve_inboxes ($;$) {
                $cfg->each_inbox(sub {
                        my ($ibx) = @_;
                        $ibx->{version} ||= 1;
-                       my $path = abs_path($ibx->{mainrepo});
+                       my $path = abs_path($ibx->{inboxdir});
                        if (defined($path)) {
                                $dir2ibx{$path} = $ibx;
                        } else {
                                warn <<EOF;
-W: $ibx->{name} $ibx->{mainrepo}: $!
+W: $ibx->{name} $ibx->{inboxdir}: $!
 EOF
                        }
                });
@@ -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 ],
@@ -199,12 +196,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) {