diff options
author | Eric Wong <e@80x24.org> | 2021-09-21 07:41:55 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-09-21 19:18:35 +0000 |
commit | 8b91bd5f929bf166ee3a79dec43fba0e68b1dc8e (patch) | |
tree | 99a83624c6c34d8f0f7577e259481b23c4619353 /lib/PublicInbox/LeiLsMailSource.pm | |
parent | 1ed1a566c7d300ab8afb604b2e7c939299318005 (diff) | |
download | public-inbox-8b91bd5f929bf166ee3a79dec43fba0e68b1dc8e.tar.gz |
"lei export-kw" no longer completes for anonymous sources. More commands use "lei refresh-mail-sync" as a basis for their completion work, as well. ";AUTH=ANONYMOUS@" is stripped from completions since it was preventing bash completion from working on AUTH=ANONYMOUS IMAP URLs. I'm not sure if there's a better way, but all of our code works fine without specifying AUTH=ANONYMOUS as a command-line arg. Finally, we fallback to using more candidates if none can be found, allowing multiple URLs to be completed.
Diffstat (limited to 'lib/PublicInbox/LeiLsMailSource.pm')
-rw-r--r-- | lib/PublicInbox/LeiLsMailSource.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/PublicInbox/LeiLsMailSource.pm b/lib/PublicInbox/LeiLsMailSource.pm index 2265969a..1db15d57 100644 --- a/lib/PublicInbox/LeiLsMailSource.pm +++ b/lib/PublicInbox/LeiLsMailSource.pm @@ -107,12 +107,13 @@ sub lei_ls_mail_source { sub _complete_ls_mail_source { my ($lei, @argv) = @_; my $match_cb = $lei->complete_url_prepare(\@argv); - my @m = map { $match_cb->($_) } $lei->url_folder_cache->keys; - my %f = map { $_ => 1 } @m; + my @k = $lei->url_folder_cache->keys($argv[-1], 1); + my @m = map { $match_cb->($_) } @k; + my %f = map { $_ => 1 } (@m ? @m : @k); if (my $lms = $lei->lms) { - @m = map { $match_cb->($_) } grep( - m!\A(?:imaps?|nntps?|s?news)://!, $lms->folders); - @f{@m} = @m; + @k = $lms->folders($argv[-1], 1); + @m = map { $match_cb->($_) } grep(m!\A[a-z]+://!, @k); + if (@m) { @f{@m} = @m } else { @f{@k} = @k } } keys %f; } |