lei import: support shell completion of known folders

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

diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index 6cc2e671d9eb4d9b789de6a3310fcf77bbfb1319..6fd3efef6cbd8f9259098f0a43faf2613cda9998 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.'));
@@ -50,10 +50,16 @@ my %re_map = ( '*' => '[^/]*?', '?' => '[^/]',
                '[' => '[', ']' => ']', ',' => ',' );
 
 sub glob2re {
-       my ($re) = @_;
+       my $re = $_[-1];
        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
@@ -138,12 +144,11 @@ sub add_external_finish {
 
 sub lei_add_external {
        my ($self, $location) = @_;
-       $self->_lei_store(1)->write_prepare($self);
        my $opt = $self->{opt};
        my $mirror = $opt->{mirror} // do {
                my @fail;
                for my $sw ($self->index_opt, $self->curl_opt,
-                               qw(c no-torsocks torsocks inbox-version)) {
+                               qw(no-torsocks torsocks inbox-version)) {
                        my ($f) = (split(/|/, $sw, 2))[0];
                        next unless defined $opt->{$f};
                        $f = length($f) == 1 ? "-$f" : "--$f";
@@ -164,9 +169,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);
@@ -205,20 +215,22 @@ sub lei_forget_external {
        }
 }
 
-sub _complete_url_common ($) {
-       my ($argv) = @_;
+# returns an anonymous sub which returns an array of potential results
+sub complete_url_prepare {
+       my $argv = $_[-1];
        # Workaround bash word-splitting URLs to ['https', ':', '//' ...]
        # Maybe there's a better way to go about this in
        # contrib/completion/lei-completion.bash
        my $re = '';
-       my $cur = pop @$argv;
+       my $cur = pop(@$argv) // '';
        if (@$argv) {
                my @x = @$argv;
                if ($cur eq ':' && @x) {
                        push @x, $cur;
                        $cur = '';
                }
-               while (@x > 2 && $x[0] !~ /\Ahttps?\z/ && $x[1] ne ':') {
+               while (@x > 2 && $x[0] !~ /\A(?:http|nntp|imap)s?\z/i &&
+                               $x[1] ne ':') {
                        shift @x;
                }
                if (@x >= 2) { # qw(https : hostname : 443) or qw(http :)
@@ -228,37 +240,38 @@ sub _complete_url_common ($) {
                }
                $re = quotemeta($re);
        }
-       ($cur, $re);
+       my $match_cb = sub {
+               # only return the part specified on the CLI
+               # don't duplicate if already 100% completed
+               $_[0] =~ /\A$re(\Q$cur\E.*)/ ? ($cur eq $1 ? () : $1) : ()
+       };
+       wantarray ? ($re, $cur, $match_cb) : $match_cb;
 }
 
 # shell completion helper called by lei__complete
 sub _complete_forget_external {
        my ($self, @argv) = @_;
-       my $cfg = $self->_lei_cfg(0);
-       my ($cur, $re) = _complete_url_common(\@argv);
+       my $cfg = $self->_lei_cfg;
+       my ($cur, $re, $match_cb) = complete_url_prepare(\@argv);
        # FIXME: bash completion off "http:" or "https:" when the last
        # character is a colon doesn't work properly even if we're
        # returning "//$HTTP_HOST/$PATH_INFO/", not sure why, could
        # be a bash issue.
        map {
-               my $x = substr($_, length('external.'));
-               # only return the part specified on the CLI
-               # don't duplicate if already 100% completed
-               $x =~ /\A$re(\Q$cur\E.*)/ ? ($cur eq $1 ? () : $1) : ();
+               $match_cb->(substr($_, length('external.')));
        } grep(/\Aexternal\.$re\Q$cur/, @{$cfg->{-section_order}});
 }
 
 sub _complete_add_external { # for bash, this relies on "compopt -o nospace"
        my ($self, @argv) = @_;
-       my $cfg = $self->_lei_cfg(0);
-       my ($cur, $re) = _complete_url_common(\@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);
-               $u = $u->as_string;
-               $u =~ /\A$re(\Q$cur\E.*)/ ? ($cur eq $1 ? () : $1) : ();
+               $match_cb->($u->as_string);
        } grep(m!\Aexternal\.https?://!, @{$cfg->{-section_order}});
 }