inbox: add ->version method

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

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index 5a3554cfe460c9efb8189f93422fc90a9a5efe9b..2d3e0281f4d71dac716b5720b255f60577075a61 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -9,7 +9,9 @@ use warnings;
 use Cwd 'abs_path';
 use base qw(Exporter);
 our @EXPORT_OK = qw(resolve_repo_dir);
-require PublicInbox::Config;
+use PublicInbox::Config;
+use PublicInbox::Inbox;
+use PublicInbox::Spawn qw(popen_rd);
 
 sub resolve_repo_dir {
        my ($cd, $ver) = @_;
@@ -18,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 (cwd:$cd): $!\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
@@ -81,7 +69,6 @@ sub unconfigured_ibx ($$) {
 
 sub resolve_inboxes ($;$$) {
        my ($argv, $opt, $cfg) = @_;
-       require PublicInbox::Inbox;
        $opt ||= {};
 
        $cfg //= eval { PublicInbox::Config->new };
@@ -97,7 +84,6 @@ sub resolve_inboxes ($;$$) {
        if ($cfg) {
                $cfg->each_inbox(sub {
                        my ($ibx) = @_;
-                       $ibx->{version} ||= 1;
                        my $path = abs_path($ibx->{inboxdir});
                        if (defined($path)) {
                                $dir2ibx{$path} = $ibx;
@@ -110,7 +96,7 @@ 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;
@@ -202,7 +188,7 @@ invalid indexlevel=$indexlevel (must be `basic', `medium', or `full')
 sub index_inbox {
        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 = $im // eval { $ibx->importer(0) } || eval {