lei forget-external: just show the location

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

diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index 64faf5a08b2b61b6d6d9d41ce78f5ff21cd8f0c8..5b5f08d178d0f04d68455b0ad0964c0849c2cccb 100644 (file)
--- a/lib/PublicInbox/LeiExternal.pm
+++ b/lib/PublicInbox/LeiExternal.pm
@@ -7,6 +7,7 @@ use strict;
 use v5.10.1;
 use parent qw(Exporter);
 our @EXPORT = qw(lei_ls_external lei_add_external lei_forget_external);
+use PublicInbox::Config;
 
 sub _externals_each {
        my ($self, $cb, @arg) = @_;
@@ -30,7 +31,6 @@ sub _externals_each {
 
 sub lei_ls_external {
        my ($self, @argv) = @_;
-       my $stor = $self->_lei_store(0);
        my $out = $self->{1};
        my ($OFS, $ORS) = $self->{opt}->{z} ? ("\0", "\0\0") : (" ", "\n");
        $self->_externals_each(sub {
@@ -39,24 +39,99 @@ sub lei_ls_external {
        });
 }
 
+sub _canonicalize {
+       my ($location) = @_;
+       if ($location !~ m!\Ahttps?://!) {
+               PublicInbox::Config::rel2abs_collapsed($location);
+       } else {
+               require URI;
+               my $uri = URI->new($location)->canonical;
+               my $path = $uri->path . '/';
+               $path =~ tr!/!/!s; # squeeze redundant '/'
+               $uri->path($path);
+               $uri->as_string;
+       }
+}
+
 sub lei_add_external {
-       my ($self, $url_or_dir) = @_;
+       my ($self, $location) = @_;
        my $cfg = $self->_lei_cfg(1);
-       if ($url_or_dir !~ m!\Ahttps?://!) {
-               $url_or_dir = File::Spec->canonpath($url_or_dir);
-       }
        my $new_boost = $self->{opt}->{boost} // 0;
-       my $key = "external.$url_or_dir.boost";
+       $location = _canonicalize($location);
+       my $key = "external.$location.boost";
        my $cur_boost = $cfg->{$key};
        return if defined($cur_boost) && $cur_boost == $new_boost; # idempotent
        $self->lei_config($key, $new_boost);
-       my $stor = $self->_lei_store(1);
-       # TODO: add to MiscIdx
-       $stor->done;
+       $self->_lei_store(1)->done; # just create the store
 }
 
 sub lei_forget_external {
-       # TODO
+       my ($self, @locations) = @_;
+       my $cfg = $self->_lei_cfg(1);
+       my $quiet = $self->{opt}->{quiet};
+       for my $loc (@locations) {
+               my (@unset, @not_found);
+               for my $l ($loc, _canonicalize($loc)) {
+                       my $key = "external.$l.boost";
+                       delete($cfg->{$key});
+                       $self->_config('--unset', $key);
+                       if ($? == 0) {
+                               push @unset, $l;
+                       } elsif (($? >> 8) == 5) {
+                               push @not_found, $l;
+                       } else {
+                               $self->err("# --unset $key error");
+                               return $self->x_it($?);
+                       }
+               }
+               if (@unset) {
+                       next if $quiet;
+                       $self->err("# $_ gone") for @unset;
+               } elsif (@not_found) {
+                       $self->err("# $_ not found") for @not_found;
+               } # else { already exited
+       }
+}
+
+# shell completion helper called by lei__complete
+sub _complete_forget_external {
+       my ($self, @argv) = @_;
+       my $cfg = $self->_lei_cfg(0);
+       my $cur = pop @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;
+               if ($cur eq ':' && @x) {
+                       push @x, $cur;
+                       $cur = '';
+               }
+               while (@x > 2 && $x[0] !~ /\Ahttps?\z/ && $x[1] ne ':') {
+                       shift @x;
+               }
+               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 = quotemeta($re);
+       }
+       # 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
+               if ($x =~ /\A$re(\Q$cur\E.*)/) {
+                       # don't duplicate if already 100% completed
+                       $cur eq $1 ? () : $1;
+               } else {
+                       ();
+               }
+       } grep(/\Aexternal\.$re\Q$cur/, @{$cfg->{-section_order}});
 }
 
 1;