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;
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);
}
}
+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
my ($self, @locations) = @_;
my $cfg = $self->_lei_cfg(1);
my $quiet = $self->{opt}->{quiet};
+ 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});
$self->_config('--unset', $key);
if ($? == 0) {
- push @unset, $key;
+ push @unset, $l;
} elsif (($? >> 8) == 5) {
- push @not_found, $key;
+ push @not_found, $l;
} else {
$self->err("# --unset $key error");
return $self->x_it($?);
}
if (@unset) {
next if $quiet;
- $self->err("# $_ unset") for @unset;
+ $self->err("# $_ gone") for @unset;
} elsif (@not_found) {
$self->err("# $_ not found") for @not_found;
} # else { already exited
# Workaround bash word-splitting URLs to ['https', ':', '//' ...]
# Maybe there's a better way to go about this in
# contrib/completion/lei-completion.bash
- my $colon = ($argv[-1] // '') eq ':';
- my $re = $cur =~ /\A[\w-]/ ? '' : '.*';
+ 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
- $colon && $x =~ /(\Q$cur\E.*)/ ? $1 : $x;
+ 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}});
}