* [PATCH 4/5] lei import: use url_folder_cache for completion
2021-06-12 0:10 6% [PATCH 0/5] lei ls-mail-source-related things Eric Wong
@ 2021-06-12 0:10 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-06-12 0:10 UTC (permalink / raw)
To: meta
And fix "lei index" completion while we're at it.
---
lib/PublicInbox/LeiImport.pm | 11 ++++++++---
lib/PublicInbox/LeiIndex.pm | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm
index 08794f71..7580e37e 100644
--- a/lib/PublicInbox/LeiImport.pm
+++ b/lib/PublicInbox/LeiImport.pm
@@ -118,10 +118,15 @@ sub lei_import { # the main "lei import" method
sub _complete_import {
my ($lei, @argv) = @_;
- my $sto = $lei->_lei_store or return;
- my $lms = $sto->search->lms or return;
my $match_cb = $lei->complete_url_prepare(\@argv);
- map { $match_cb->($_) } $lms->folders;
+ my @m = map { $match_cb->($_) } $lei->url_folder_cache->keys;
+ my %f = map { $_ => 1 } @m;
+ my $sto = $lei->_lei_store;
+ if (my $lms = $sto ? $sto->search->lms : undef) {
+ @m = map { $match_cb->($_) } $lms->folders;
+ @f{@m} = @m;
+ }
+ keys %f;
}
no warnings 'once';
diff --git a/lib/PublicInbox/LeiIndex.pm b/lib/PublicInbox/LeiIndex.pm
index 4be0c649..5b545998 100644
--- a/lib/PublicInbox/LeiIndex.pm
+++ b/lib/PublicInbox/LeiIndex.pm
@@ -39,7 +39,7 @@ for my $m (qw(pmdir_cb input_net_cb)) {
*$m = PublicInbox::LeiImport->can($m);
}
-*_complete_import = \&PublicInbox::LeiImport::_complete_import;
+*_complete_index = \&PublicInbox::LeiImport::_complete_import;
*ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child;
*net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done;
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] lei ls-mail-source-related things
@ 2021-06-12 0:10 6% Eric Wong
2021-06-12 0:10 7% ` [PATCH 4/5] lei import: use url_folder_cache for completion Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-06-12 0:10 UTC (permalink / raw)
To: meta
A couple of minor usability things that'll make "lei import"
easier for bash completion users.
Eric Wong (5):
lei: stop pager early on exit
lei ls-mail-source: write through to URL folder cache
t/lei-import-http: quiet unnecessary diag message
lei import: use url_folder_cache for completion
net_reader: canonicalize URL args on add_url
lib/PublicInbox/LEI.pm | 10 ++++++-
lib/PublicInbox/LeiImport.pm | 11 +++++---
lib/PublicInbox/LeiIndex.pm | 2 +-
lib/PublicInbox/LeiLsMailSource.pm | 42 ++++++++++++++++++++++++++++--
lib/PublicInbox/NetReader.pm | 2 ++
lib/PublicInbox/SharedKV.pm | 13 +++++++--
t/lei-import-http.t | 2 --
7 files changed, 71 insertions(+), 11 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-06-12 0:10 6% [PATCH 0/5] lei ls-mail-source-related things Eric Wong
2021-06-12 0:10 7% ` [PATCH 4/5] lei import: use url_folder_cache for completion Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).