lei add-external: split into separate file

Also was written before we had auto-loading and rarely used.

diff --git a/MANIFEST b/MANIFEST
index a39afe24aa8715af1453ab3ae5010e5994047b6c..8db9cdc791bba2546cdfe0a4c85279b323e841ec 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -207,6 +207,7 @@ lib/PublicInbox/KQNotify.pm
 lib/PublicInbox/LEI.pm
 lib/PublicInbox/LI2Wrap.pm
 lib/PublicInbox/LeiALE.pm
+lib/PublicInbox/LeiAddExternal.pm
 lib/PublicInbox/LeiAddWatch.pm
 lib/PublicInbox/LeiAuth.pm
 lib/PublicInbox/LeiBlob.pm

diff --git a/lib/PublicInbox/LeiAddExternal.pm b/lib/PublicInbox/LeiAddExternal.pm
new file mode 100644 (file)
index 0000000..5eef206
--- /dev/null
+++ b/lib/PublicInbox/LeiAddExternal.pm
@@ -0,0 +1,72 @@
+# Copyright (C) all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# "lei add-external" command
+package PublicInbox::LeiAddExternal;
+use strict;
+use v5.10.1;
+
+sub _finish_add_external {
+       my ($lei, $location) = @_;
+       my $new_boost = $lei->{opt}->{boost} // 0;
+       my $key = "external.$location.boost";
+       my $cur_boost = $lei->_lei_cfg(1)->{$key};
+       return if defined($cur_boost) && $cur_boost == $new_boost; # idempotent
+       $lei->_config($key, $new_boost);
+}
+
+sub lei_add_external {
+       my ($lei, $location) = @_;
+       my $mirror = $lei->{opt}->{mirror} // do {
+               my @fail;
+               for my $sw ($lei->index_opt, $lei->curl_opt,
+                               qw(no-torsocks torsocks inbox-version)) {
+                       my ($f) = (split(/|/, $sw, 2))[0];
+                       next unless defined $lei->{opt}->{$f};
+                       $f = length($f) == 1 ? "-$f" : "--$f";
+                       push @fail, $f;
+               }
+               if (scalar(@fail) == 1) {
+                       return $lei->("@fail requires --mirror");
+               } elsif (@fail) {
+                       my $last = pop @fail;
+                       my $fail = join(', ', @fail);
+                       return $lei->("@fail and $last require --mirror");
+               }
+               undef;
+       };
+       $location = $lei->ext_canonicalize($location);
+       if (defined($mirror) && -d $location) {
+               $lei->fail(<<""); # TODO: did you mean "update-external?"
+--mirror destination `$location' already exists
+
+       } elsif (-d $location) {
+               index($location, "\n") >= 0 and
+                       return $lei->fail("`\\n' not allowed in `$location'");
+       }
+       if ($location !~ m!\Ahttps?://! && !-d $location) {
+               $mirror // return $lei->fail("$location not a directory");
+               index($location, "\n") >= 0 and
+                       return $lei->fail("`\\n' not allowed in `$location'");
+               $mirror = $lei->ext_canonicalize($mirror);
+               require PublicInbox::LeiMirror;
+               PublicInbox::LeiMirror->start($lei, $mirror => $location);
+       } else {
+               _finish_add_external($lei, $location);
+       }
+}
+
+sub _complete_add_external { # for bash, this relies on "compopt -o nospace"
+       my ($lei, @argv) = @_;
+       my $cfg = $lei->_lei_cfg or return ();
+       my $match_cb = $lei->complete_url_prepare(\@argv);
+       require URI;
+       map {
+               my $u = URI->new(substr($_, length('external.')));
+               my ($base) = ($u->path =~ m!((?:/?.*)?/)[^/]+/?\z!);
+               $u->path($base);
+               $match_cb->($u->as_string);
+       } grep(m!\Aexternal\.https?://!, @{$cfg->{-section_order}});
+}
+
+1;

diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index 35a7d68a17b5bc0bab41c267e1c385a1283d5782..5a54cc19281ea51f970ce769809c2a0b4bc131ef 100644 (file)
--- a/lib/PublicInbox/LeiExternal.pm
+++ b/lib/PublicInbox/LeiExternal.pm
@@ -132,59 +132,6 @@ sub lei_ls_external {
        }
 }
 
-sub add_external_finish {
-       my ($self, $location) = @_;
-       my $cfg = $self->_lei_cfg(1);
-       my $new_boost = $self->{opt}->{boost} // 0;
-       my $key = "external.$location.boost";
-       my $cur_boost = $cfg->{$key};
-       return if defined($cur_boost) && $cur_boost == $new_boost; # idempotent
-       $self->_config($key, $new_boost);
-}
-
-sub lei_add_external {
-       my ($self, $location) = @_;
-       my $opt = $self->{opt};
-       my $mirror = $opt->{mirror} // do {
-               my @fail;
-               for my $sw ($self->index_opt, $self->curl_opt,
-                               qw(no-torsocks torsocks inbox-version)) {
-                       my ($f) = (split(/|/, $sw, 2))[0];
-                       next unless defined $opt->{$f};
-                       $f = length($f) == 1 ? "-$f" : "--$f";
-                       push @fail, $f;
-               }
-               if (scalar(@fail) == 1) {
-                       return $self->("@fail requires --mirror");
-               } elsif (@fail) {
-                       my $last = pop @fail;
-                       my $fail = join(', ', @fail);
-                       return $self->("@fail and $last require --mirror");
-               }
-               undef;
-       };
-       my $new_boost = $opt->{boost} // 0;
-       $location = ext_canonicalize($location);
-       if (defined($mirror) && -d $location) {
-               $self->fail(<<""); # TODO: did you mean "update-external?"
---mirror destination `$location' already exists
-
-       } elsif (-d $location) {
-               index($location, "\n") >= 0 and
-                       return $self->fail("`\\n' not allowed in `$location'");
-       }
-       if ($location !~ m!\Ahttps?://! && !-d $location) {
-               $mirror // return $self->fail("$location not a directory");
-               index($location, "\n") >= 0 and
-                       return $self->fail("`\\n' not allowed in `$location'");
-               $mirror = ext_canonicalize($mirror);
-               require PublicInbox::LeiMirror;
-               PublicInbox::LeiMirror->start($self, $mirror => $location);
-       } else {
-               add_external_finish($self, $location);
-       }
-}
-
 # returns an anonymous sub which returns an array of potential results
 sub complete_url_prepare {
        my $argv = $_[-1]; # $_[0] may be $lei
@@ -223,17 +170,4 @@ sub complete_url_prepare {
        wantarray ? ($re, $cur, $match_cb) : $match_cb;
 }
 
-sub _complete_add_external { # for bash, this relies on "compopt -o nospace"
-       my ($self, @argv) = @_;
-       my $cfg = $self->_lei_cfg;
-       my $match_cb = complete_url_prepare(\@argv);
-       require URI;
-       map {
-               my $u = URI->new(substr($_, length('external.')));
-               my ($base) = ($u->path =~ m!((?:/?.*)?/)[^/]+/?\z!);
-               $u->path($base);
-               $match_cb->($u->as_string);
-       } grep(m!\Aexternal\.https?://!, @{$cfg->{-section_order}});
-}
-
 1;

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index 1ab5e0d898d26a5a842ffd515b2dd17fe9fd35b4..5cfa6fea851c9d11b6979228e9e950c49adef69d 100644 (file)
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -23,7 +23,8 @@ sub _wq_done_wait { # dwaitpid callback (via wq_eof)
                $lei->err("unlink($f): $!") unless $!{ENOENT};
        } else {
                if ($lei->{cmd} ne 'public-inbox-clone') {
-                       $lei->add_external_finish($mrr->{dst});
+                       $lei->lazy_cb('add-external', '_finish_'
+                                       )->($lei, $mrr->{dst});
                }
                $lei->qerr("# mirrored $mrr->{src} => $mrr->{dst}");
        }