lei add-external: completion for existing URL basenames

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

diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index e7693e09a7de67a427742590707926352e54aed0..accacf1a98d0ed15ed0ce079816380998a9912a6 100644 (file)
--- a/lib/PublicInbox/LeiExternal.pm
+++ b/lib/PublicInbox/LeiExternal.pm
@@ -9,7 +9,7 @@ use parent qw(Exporter);
 our @EXPORT = qw(lei_ls_external lei_add_external lei_forget_external);
 use PublicInbox::Config;
 
-sub _externals_each {
+sub externals_each {
        my ($self, $cb, @arg) = @_;
        my $cfg = $self->_lei_cfg(0);
        my %boost;
@@ -31,15 +31,14 @@ sub _externals_each {
 
 sub lei_ls_external {
        my ($self, @argv) = @_;
-       my $out = $self->{1};
        my ($OFS, $ORS) = $self->{opt}->{z} ? ("\0", "\0\0") : (" ", "\n");
-       $self->_externals_each(sub {
+       externals_each($self, sub {
                my ($loc, $boost_val) = @_;
-               print $out $loc, $OFS, 'boost=', $boost_val, $ORS;
+               $self->out($loc, $OFS, 'boost=', $boost_val, $ORS);
        });
 }
 
-sub _canonicalize {
+sub ext_canonicalize {
        my ($location) = @_;
        if ($location !~ m!\Ahttps?://!) {
                PublicInbox::Config::rel2abs_collapsed($location);
@@ -53,11 +52,50 @@ sub _canonicalize {
        }
 }
 
+my %patmap = ('*' => '[^/]*?', '?' => '[^/]', '[' => '[', ']' => ']');
+sub glob2pat {
+       my ($glob) = @_;
+        $glob =~ s!(.)!$patmap{$1} || "\Q$1"!ge;
+        $glob;
+}
+
+sub get_externals {
+       my ($self, $loc, $exclude) = @_;
+       return (ext_canonicalize($loc)) if -e $loc;
+
+       my @m;
+       my @cur = externals_each($self);
+       my $do_glob = !$self->{opt}->{globoff}; # glob by default
+       if ($do_glob && ($loc =~ /[\*\?]/s || $loc =~ /\[.*\]/s)) {
+               my $re = glob2pat($loc);
+               @m = grep(m!$re!, @cur);
+               return @m if scalar(@m);
+       } elsif (index($loc, '/') < 0) { # exact basename match:
+               @m = grep(m!/\Q$loc\E/?\z!, @cur);
+               return @m if scalar(@m) == 1;
+       } elsif ($exclude) { # URL, maybe:
+               my $canon = ext_canonicalize($loc);
+               @m = grep(m!\A\Q$canon\E\z!, @cur);
+               return @m if scalar(@m) == 1;
+       } else { # URL:
+               return (ext_canonicalize($loc));
+       }
+       if (scalar(@m) == 0) {
+               $self->fail("`$loc' is unknown");
+       } else {
+               $self->fail("`$loc' is ambiguous:\n", map { "\t$_\n" } @m);
+       }
+       ();
+}
+
 sub lei_add_external {
        my ($self, $location) = @_;
        my $cfg = $self->_lei_cfg(1);
        my $new_boost = $self->{opt}->{boost} // 0;
-       $location = _canonicalize($location);
+       $location = ext_canonicalize($location);
+       if ($location !~ m!\Ahttps?://! && !-d $location) {
+               return $self->fail("$location not a directory");
+       }
        my $key = "external.$location.boost";
        my $cur_boost = $cfg->{$key};
        return if defined($cur_boost) && $cur_boost == $new_boost; # idempotent
@@ -72,7 +110,7 @@ sub lei_forget_external {
        my %seen;
        for my $loc (@locations) {
                my (@unset, @not_found);
-               for my $l ($loc, _canonicalize($loc)) {
+               for my $l ($loc, ext_canonicalize($loc)) {
                        next if $seen{$l}++;
                        my $key = "external.$l.boost";
                        delete($cfg->{$key});
@@ -95,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 = '';
@@ -116,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
@@ -127,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;