* [PATCH 3/4] lei up: more error checking for config loading
2021-04-19 23:48 5% [PATCH 0/4] "lei up --all=local" support Eric Wong
@ 2021-04-19 23:49 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-04-19 23:49 UTC (permalink / raw)
To: meta
We'll support editing the saved search config file, so user
errors may happen and we need to throw sensible errors in that
case.
---
lib/PublicInbox/LeiUp.pm | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm
index 63a7f996..e80ccf57 100644
--- a/lib/PublicInbox/LeiUp.pm
+++ b/lib/PublicInbox/LeiUp.pm
@@ -14,24 +14,27 @@ sub lei_up {
my $lss = PublicInbox::LeiSavedSearch->up($lei, $out) or return;
my $mset_opt = $lei->{mset_opt} = { relevance => -2 };
$mset_opt->{limit} = $lei->{opt}->{limit} // 10000;
+ my $f = $lss->{'-f'};
my $q = $mset_opt->{q_raw} = $lss->{-cfg}->{'lei.q'} //
- return $lei->fail("lei.q unset in $lss->{-f}");
+ return $lei->fail("lei.q unset in $f");
my $lse = $lei->{lse} // die 'BUG: {lse} missing';
if (ref($q)) {
$mset_opt->{qstr} = $lse->query_argv_to_string($lse->git, $q);
} else {
$lse->query_approxidate($lse->git, $mset_opt->{qstr} = $q);
}
- $lei->{opt}->{output} = $lss->{-cfg}->{'lei.q.output'} //
- return $lei->fail("lei.q.output unset in $lss->{-f}");
-
+ my $o = $lei->{opt}->{output} = $lss->{-cfg}->{'lei.q.output'} //
+ return $lei->fail("lei.q.output unset in $f");
+ ref($o) and return $lei->fail("multiple values of lei.q.output in $f");
for my $k (qw(only include exclude)) {
my $v = $lss->{-cfg}->get_all("lei.q.$k") // next;
$lei->{opt}->{$k} = $v;
}
for my $k (qw(external local remote
import-remote import-before threads)) {
- my $v = $lss->{-cfg}->{"lei.q.$k"} // next;
+ my $c = "lei.q.$k";
+ my $v = $lss->{-cfg}->{$c} // next;
+ ref($v) and return $lei->fail("multiple values of $c in $f");
$lei->{opt}->{$k} = $v;
}
$lei->{lss} = $lss; # for LeiOverview->new
^ permalink raw reply related [relevance 7%]
* [PATCH 0/4] "lei up --all=local" support
@ 2021-04-19 23:48 5% Eric Wong
2021-04-19 23:49 7% ` [PATCH 3/4] lei up: more error checking for config loading Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-04-19 23:48 UTC (permalink / raw)
To: meta
Eventually, "--all" and "--all=remote" will be supported,
but "--all=local" was relatively easy and will probably be
the most popular for latency-sensitive users.
Eric Wong (4):
lei up: fix help output and ARGV handling
config: favor ->get_all when possible
lei up: more error checking for config loading
lei up: support --all=local
lib/PublicInbox/LEI.pm | 7 +++-
lib/PublicInbox/LeiQuery.pm | 2 +-
lib/PublicInbox/LeiUp.pm | 75 +++++++++++++++++++++++++++++++------
lib/PublicInbox/Watch.pm | 3 +-
t/lei-q-save.t | 2 +
5 files changed, 72 insertions(+), 17 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-04-19 23:48 5% [PATCH 0/4] "lei up --all=local" support Eric Wong
2021-04-19 23:49 7% ` [PATCH 3/4] lei up: more error checking for config loading 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).