* [PATCH 4/9] lei q: disable remote externals if locals exist
2021-01-24 11:46 7% [PATCH 0/9] lei remotes fixes and updates Eric Wong
@ 2021-01-24 11:46 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-01-24 11:46 UTC (permalink / raw)
To: meta
--remote should be explicitly enabled if local externals are
present, since users may be offline or on expensive + metered
Internet while traveling.
In the future, --remote will probably default to
caching/memoizing all messages it fetches to increase the
usefulness of --local.
---
lib/PublicInbox/LEI.pm | 2 +-
lib/PublicInbox/LeiQuery.pm | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index 473a28a9..378113e8 100644
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -83,7 +83,7 @@ sub _config_path ($) {
our %CMD = ( # sorted in order of importance/use:
'q' => [ 'SEARCH_TERMS...', 'search for messages matching terms', qw(
save-as=s output|mfolder|o=s format|f=s dedupe|d=s thread|t augment|a
- sort|s=s reverse|r offset=i remote local! external! pretty mua-cmd=s
+ sort|s=s reverse|r offset=i remote! local! external! pretty mua-cmd=s
torsocks=s no-torsocks verbose|v since|after=s until|before=s),
PublicInbox::LeiQuery::curl_opt(), opt_dash('limit|n=i', '[0-9]+') ],
diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index a7938e8b..7713902b 100644
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -24,7 +24,9 @@ sub lei_q {
# --external is enabled by default, but allow --no-external
if ($opt->{external} //= 1) {
my $cb = $lxs->can('prepare_external');
- $self->_externals_each($cb, $lxs);
+ my $ne = $self->_externals_each($cb, $lxs);
+ $opt->{remote} //= $ne == $lxs->remotes;
+ delete($lxs->{remotes}) if !$opt->{remote};
}
my $xj = $lxs->concurrency($opt);
my $ovv = PublicInbox::LeiOverview->new($self) or return;
^ permalink raw reply related [relevance 7%]
* [PATCH 0/9] lei remotes fixes and updates
@ 2021-01-24 11:46 7% Eric Wong
2021-01-24 11:46 7% ` [PATCH 4/9] lei q: disable remote externals if locals exist Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-01-24 11:46 UTC (permalink / raw)
To: meta
Eric Wong (9):
lei q: limit concurrency to 4 remote connections
ipc: wq supports arbitrarily large payloads
ipc: get rid of wq_set_recv_modes
lei q: disable remote externals if locals exist
lei q: honor --no-local to force remote searches
lei_xsearch: use curl -d '' for nginx compatibility
lei q: fix JSON overview with remote externals
smsg: make parse_references an object method
smsg: parse_references: micro-optimization to avoid ++
lib/PublicInbox/IPC.pm | 85 +++++++++++++++++----------
lib/PublicInbox/LEI.pm | 9 ++-
lib/PublicInbox/LeiOverview.pm | 2 +-
lib/PublicInbox/LeiQuery.pm | 13 ++++-
lib/PublicInbox/LeiToMail.pm | 7 +--
lib/PublicInbox/LeiXSearch.pm | 101 ++++++++++++++++++---------------
lib/PublicInbox/OverIdx.pm | 22 +------
lib/PublicInbox/SearchIdx.pm | 2 +-
lib/PublicInbox/Smsg.pm | 22 ++++++-
script/lei | 11 ++--
t/cmd_ipc.t | 16 ++++++
t/ipc.t | 21 ++++++-
t/lei.t | 3 +
13 files changed, 196 insertions(+), 118 deletions(-)
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-01-24 11:46 7% [PATCH 0/9] lei remotes fixes and updates Eric Wong
2021-01-24 11:46 7% ` [PATCH 4/9] lei q: disable remote externals if locals exist 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).