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-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,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 F0BA71F9FC for ; Sat, 27 Mar 2021 23:22:38 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] lei mark: relax label requirements Date: Sat, 27 Mar 2021 23:22:38 +0000 Message-Id: <20210327232238.12761-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: It seems safe to use ALLCAPS labels like "INBOX" with Xapian. We'll also allow single-character labels. --- lib/PublicInbox/LeiMark.pm | 2 +- t/lei-mark.t | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/LeiMark.pm b/lib/PublicInbox/LeiMark.pm index 6d236411..34846b84 100644 --- a/lib/PublicInbox/LeiMark.pm +++ b/lib/PublicInbox/LeiMark.pm @@ -23,7 +23,7 @@ my %ERR = ( my ($label) = @_; length($label) >= $L_MAX and return "`$label' too long (must be <= $L_MAX)"; - $label =~ m{\A[a-z0-9_][a-z0-9_\-\./\@,]*[a-z0-9]\z} ? + $label =~ m{\A[a-z0-9_](?:[a-z0-9_\-\./\@,]*[a-z0-9])?\z}i ? undef : "`$label' is invalid"; }, kw => sub { diff --git a/t/lei-mark.t b/t/lei-mark.t index 23f5002e..7855839e 100644 --- a/t/lei-mark.t +++ b/t/lei-mark.t @@ -78,6 +78,12 @@ test_lei(sub { lei_ok(qw(ls-label)); is($lei_out, "nope\nqp\nurgent\n", 'ls-label shows qp'); + lei_ok qw(mark -F eml t/utf8.eml +L:INBOX +L:x); diag $lei_err; + lei_ok qw(q m:testmessage@example.com); + $check_kw->([qw(answered seen)], L => [qw(INBOX nope urgent x)]); + lei_ok(qw(ls-label)); + is($lei_out, "INBOX\nnope\nqp\nurgent\nx\n", 'ls-label shows qp'); + if (0) { # TODO label+kw search w/ externals lei_ok(qw(q L:qp), "mid:$mid", '--only', "$ro_home/t2"); }