lei add-external: completion for existing URL basenames

Given the presence of one external on a certain host or prefix
path, it's logical other inboxes would share a common prefix.
For bash users, attempt to complete that using the "-o nospace"
option of bash

3 files changed, 39 insertions, 14 deletions

diff --git a/contrib/completion/lei-completion.bash b/contrib/completion/lei-completion.bash
index 0b82b109..fbda474c 100644
--- a/contrib/completion/lei-completion.bash
+++ b/contrib/completion/lei-completion.bash
@@ -4,6 +4,12 @@
 # preliminary bash completion support for lei (Local Email Interface)
 # Needs a lot of work, see `lei__complete' in lib/PublicInbox::LEI.pm
 _lei() {
+        case ${COMP_WORDS[@]} in
+        *' add-external http'*)
+                compopt -o nospace
+                ;;
+        *) compopt +o nospace ;; # the default
+        esac
         COMPREPLY=($(compgen -W "$(lei _complete ${COMP_WORDS[@]})" \
                         -- "${COMP_WORDS[COMP_CWORD]}"))
         return 0
diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index 6b4c7fb0..accacf1a 100644
--- a/lib/PublicInbox/LeiExternal.pm
+++ b/lib/PublicInbox/LeiExternal.pm
@@ -133,17 +133,15 @@ sub lei_forget_external {
         }
 }
 
-# shell completion helper called by lei__complete
-sub _complete_forget_external {
-        my ($self, @argv) = @_;
-        my $cfg = $self->_lei_cfg(0);
-        my $cur = pop @argv;
+sub _complete_url_common ($) {
+        my ($argv) = @_;
         # 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 = '';
-        if (@argv) {
-                my @x = @argv;
+        my $cur = pop @$argv;
+        if (@$argv) {
+                my @x = @$argv;
                 if ($cur eq ':' && @x) {
                         push @x, $cur;
                         $cur = '';
@@ -154,10 +152,18 @@ sub _complete_forget_external {
                 if (@x >= 2) { # qw(https : hostname : 443) or qw(http :)
                         $re = join('', @x);
                 } else { # just filter out the flags and hope for the best
-                        $re = join('', grep(!/^-/, @argv));
+                        $re = join('', grep(!/^-/, @$argv));
                 }
                 $re = quotemeta($re);
         }
+        ($cur, $re);
+}
+
+# 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);
         # 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
@@ -165,13 +171,23 @@ sub _complete_forget_external {
         map {
                 my $x = substr($_, length('external.'));
                 # only return the part specified on the CLI
-                if ($x =~ /\A$re(\Q$cur\E.*)/) {
-                        # don't duplicate if already 100% completed
-                        $cur eq $1 ? () : $1;
-                } else {
-                        ();
-                }
+                # don't duplicate if already 100% completed
+                $x =~ /\A$re(\Q$cur\E.*)/ ? ($cur eq $1 ? () : $1) : ();
         } 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);
+        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) : ();
+        } grep(m!\Aexternal\.https?://!, @{$cfg->{-section_order}});
+}
+
 1;
diff --git a/t/lei.t b/t/lei.t
index 461669a8..03bbb078 100644
--- a/t/lei.t
+++ b/t/lei.t
@@ -233,6 +233,9 @@ my $test_external = sub {
                                 "completed partial URL $u on q $qo");
                 }
         }
+        ok($lei->(qw(_complete lei add-external), 'https://'),
+                'add-external hostname completion');
+        is($out, "https://example.com/\n", 'completed up to hostname');
 
         $lei->('ls-external');
         like($out, qr!https://example\.com/ibx/!s, 'added canonical URL');