inbox: add ->version method

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

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 6e710cd59794f485faefd9973b3f1f0818da3489..2d3e0281f4d71dac716b5720b255f60577075a61 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -9,8 +9,9 @@ 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;
+use PublicInbox::Config;
+use PublicInbox::Inbox;
+use PublicInbox::Spawn qw(popen_rd);
 
 sub resolve_repo_dir {
        my ($cd, $ver) = @_;
@@ -19,28 +20,14 @@ sub resolve_repo_dir {
                $$ver = 2 if $ver;
                return abs_path($prefix);
        }
-
-       my @cmd = qw(git rev-parse --git-dir);
-       my $cmd = join(' ', @cmd);
-       my $pid = open my $fh, '-|';
-       defined $pid or die "forking $cmd failed: $!\n";
-       if ($pid == 0) {
-               if (defined $cd) {
-                       chdir $cd or die "chdir $cd failed: $!\n";
-               }
-               exec @cmd;
-               die "Failed to exec $cmd: $!\n";
-       } else {
-               my $dir = eval {
-                       local $/;
-                       <$fh>;
-               };
-               close $fh or die "error in $cmd: $!\n";
-               chomp $dir;
-               $$ver = 1 if $ver;
-               return abs_path($cd) if ($dir eq '.' && defined $cd);
-               abs_path($dir);
-       }
+       my $cmd = [ qw(git rev-parse --git-dir) ];
+       my $fh = popen_rd($cmd, undef, {-C => $cd});
+       my $dir = do { local $/; <$fh> };
+       close $fh or die "error in ".join(' ', @$cmd)." (cwd:$cd): $!\n";
+       chomp $dir;
+       $$ver = 1 if $ver;
+       return abs_path($cd) if ($dir eq '.' && defined $cd);
+       abs_path($dir);
 }
 
 # for unconfigured inboxes
@@ -61,7 +48,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 +61,17 @@ 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) = @_;
-       require PublicInbox::Inbox;
+sub resolve_inboxes ($;$$) {
+       my ($argv, $opt, $cfg) = @_;
        $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";
@@ -100,13 +84,19 @@ sub resolve_inboxes ($;$) {
        if ($cfg) {
                $cfg->each_inbox(sub {
                        my ($ibx) = @_;
-                       $ibx->{version} ||= 1;
-                       $dir2ibx{abs_path($ibx->{mainrepo})} = $ibx;
+                       my $path = abs_path($ibx->{inboxdir});
+                       if (defined($path)) {
+                               $dir2ibx{$path} = $ibx;
+                       } else {
+                               warn <<EOF;
+W: $ibx->{name} $ibx->{inboxdir}: $!
+EOF
+                       }
                });
        }
        if ($opt->{all}) {
                my @all = values %dir2ibx;
-               @all = grep { $_->{version} >= $min_ver } @all;
+               @all = grep { $_->version >= $min_ver } @all;
                push @ibxs, @all;
        } else { # directories specified on the command-line
                my $i = 0;
@@ -132,7 +122,7 @@ sub resolve_inboxes ($;$) {
 }
 
 # 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 ],
@@ -155,6 +145,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 $@;
@@ -192,12 +186,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) {
+       if (ref($ibx) && $ibx->version == 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) {
@@ -233,8 +227,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 @_ };