lei: add-external --mirror support

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

diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm
index ea82133aa8adef38c994e528bf38649d4924bcf1..b21fb2418699d5ac26e838928e279b83566b4b8d 100644 (file)
--- a/lib/PublicInbox/Admin.pm
+++ b/lib/PublicInbox/Admin.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # common stuff for administrative command-line tools
@@ -10,7 +10,8 @@ our @EXPORT_OK = qw(setup_signals);
 use PublicInbox::Config;
 use PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
-use File::Spec ();
+use PublicInbox::Eml;
+*rel2abs_collapsed = \&PublicInbox::Config::rel2abs_collapsed;
 
 sub setup_signals {
        my ($cb, $arg) = @_; # optional
@@ -27,15 +28,6 @@ sub setup_signals {
        };
 }
 
-# abs_path resolves symlinks, so we want to avoid it if rel2abs
-# is sufficient and doesn't leave "/.." or "/../"
-sub rel2abs_collapsed ($) {
-       my $p = File::Spec->rel2abs($_[0]);
-       return $p if substr($p, -3, 3) ne '/..' && index($p, '/../') < 0; # likely
-       require Cwd;
-       Cwd::abs_path($p);
-}
-
 sub resolve_inboxdir {
        my ($cd, $ver) = @_;
        my $try = $cd // '.';
@@ -136,7 +128,7 @@ sub resolve_inboxes ($;$$) {
                for (my $i = 0; $i <= $#dirs; $i++) {
                        my $dir = $dirs[$i];
                        my @st = stat($dir) or die "stat($dir): $!\n";
-                       $dir = resolve_inboxdir($dir, \(my $ver));
+                       $dir = $dirs[$i] = resolve_inboxdir($dir, \(my $ver));
                        if ($ver >= $min_ver) {
                                $s2i{"$st[0]\0$st[1]"} //= $i;
                        } else {
@@ -250,12 +242,10 @@ sub index_inbox {
        }
        local %SIG = %SIG;
        setup_signals(\&index_terminate, $ibx);
-       my $warn_cb = $SIG{__WARN__} // sub { print STDERR @_ };
        my $idx = { current_info => $ibx->{inboxdir} };
-       my $warn_ignore = PublicInbox::InboxWritable->can('warn_ignore');
        local $SIG{__WARN__} = sub {
-               return if $warn_ignore->(@_);
-               $warn_cb->($idx->{current_info}, ': ', @_);
+               return if PublicInbox::Eml::warn_ignore(@_);
+               warn($idx->{current_info}, ': ', @_);
        };
        if (ref($ibx) && $ibx->version == 2) {
                eval { require PublicInbox::V2Writable };
@@ -280,10 +270,11 @@ EOM
                $idx = PublicInbox::SearchIdx->new($ibx, 1);
        }
        $idx->index_sync($opt);
+       $idx->{nidx} // 0; # returns number processed
 }
 
-sub progress_prepare ($) {
-       my ($opt) = @_;
+sub progress_prepare ($;$) {
+       my ($opt, $dst) = @_;
 
        # public-inbox-index defaults to quiet, -xcpdb and -compact do not
        if (defined($opt->{quiet}) && $opt->{quiet} < 0) {
@@ -295,7 +286,8 @@ sub progress_prepare ($) {
                $opt->{1} = $null; # suitable for spawn() redirect
        } else {
                $opt->{verbose} ||= 1;
-               $opt->{-progress} = sub { print STDERR @_ };
+               $dst //= *STDERR{GLOB};
+               $opt->{-progress} = sub { print $dst @_ };
        }
 }