lei: All Local Externals: bare git dir for alternates

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

diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index 6cc2e671d9eb4d9b789de6a3310fcf77bbfb1319..aa09be9ea980035d4a2024497c69d025c7bf523e 100644 (file)
--- a/lib/PublicInbox/LeiExternal.pm
+++ b/lib/PublicInbox/LeiExternal.pm
@@ -9,7 +9,7 @@ use PublicInbox::Config;
 
 sub externals_each {
        my ($self, $cb, @arg) = @_;
-       my $cfg = $self->_lei_cfg(0);
+       my $cfg = $self->_lei_cfg;
        my %boost;
        for my $sec (grep(/\Aexternal\./, @{$cfg->{-section_order}})) {
                my $loc = substr($sec, length('external.'));
@@ -54,6 +54,12 @@ sub glob2re {
        my $p = '';
        my $in_bracket = 0;
        my $qm = 0;
+       my $schema_host_port = '';
+
+       # don't glob URL-looking things that look like IPv6
+       if ($re =~ s!\A([a-z0-9\+]+://\[[a-f0-9\:]+\](?::[0-9]+)?/)!!i) {
+               $schema_host_port = quotemeta $1; # "http://[::1]:1234"
+       }
        my $changes = ($re =~ s!(.)!
                $re_map{$p eq '\\' ? '' : do {
                        if ($1 eq '[') { ++$in_bracket }
@@ -69,7 +75,7 @@ sub glob2re {
                        (my $in_braces = $2) =~ tr!,!|!;
                        $1."($in_braces)";
                        /sge);
-       ($changes - $qm) ? $re : undef;
+       ($changes - $qm) ? $schema_host_port.$re : undef;
 }
 
 # get canonicalized externals list matching $loc
@@ -133,6 +139,12 @@ sub add_external_finish {
        my $key = "external.$location.boost";
        my $cur_boost = $cfg->{$key};
        return if defined($cur_boost) && $cur_boost == $new_boost; # idempotent
+       if (-d $location) {
+               require PublicInbox::LeiXSearch;
+               my $lxs = PublicInbox::LeiXSearch->new;
+               $lxs->prepare_external($location);
+               $self->ale->refresh_externals($lxs);
+       }
        $self->lei_config($key, $new_boost);
 }
 
@@ -164,9 +176,14 @@ sub lei_add_external {
                $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);
@@ -234,7 +251,7 @@ sub _complete_url_common ($) {
 # shell completion helper called by lei__complete
 sub _complete_forget_external {
        my ($self, @argv) = @_;
-       my $cfg = $self->_lei_cfg(0);
+       my $cfg = $self->_lei_cfg;
        my ($cur, $re) = _complete_url_common(\@argv);
        # FIXME: bash completion off "http:" or "https:" when the last
        # character is a colon doesn't work properly even if we're
@@ -250,7 +267,7 @@ sub _complete_forget_external {
 
 sub _complete_add_external { # for bash, this relies on "compopt -o nospace"
        my ($self, @argv) = @_;
-       my $cfg = $self->_lei_cfg(0);
+       my $cfg = $self->_lei_cfg;
        my ($cur, $re) = _complete_url_common(\@argv);
        require URI;
        map {