From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 39BEE1F9F3 for ; Mon, 19 Apr 2021 23:49:02 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/4] lei up: more error checking for config loading Date: Mon, 19 Apr 2021 14:49:00 -0900 Message-Id: <20210419234901.4084-4-e@80x24.org> In-Reply-To: <20210419234901.4084-1-e@80x24.org> References: <20210419234901.4084-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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