From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH v2] lei_input: disallow uppercase characters for labels
Date: Sun, 31 Oct 2021 09:26:58 +0000 [thread overview]
Message-ID: <20211031092658.M569433@dcvr> (raw)
In-Reply-To: <20211031091017.11274-3-e@80x24.org>
Xapian boolean terms rely on upper-case prefixes, so the terms
themselves need to be all lowercase.
---
v2: with test updates, all caps labels never worked for search
lib/PublicInbox/LeiInput.pm | 2 +-
t/lei-tag.t | 14 +++++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/LeiInput.pm b/lib/PublicInbox/LeiInput.pm
index 84fc579dc480..a1dcc907252f 100644
--- a/lib/PublicInbox/LeiInput.pm
+++ b/lib/PublicInbox/LeiInput.pm
@@ -30,7 +30,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}i ?
+ $label =~ m{\A[a-z0-9_](?:[a-z0-9_\-\./\@,]*[a-z0-9])?\z} ?
undef : "`$label' is invalid";
},
kw => sub {
diff --git a/t/lei-tag.t b/t/lei-tag.t
index 44e4659fc226..5941cd0f3da7 100644
--- a/t/lei-tag.t
+++ b/t/lei-tag.t
@@ -84,11 +84,19 @@ test_lei(sub {
lei_ok(qw(ls-label));
is($lei_out, "nope\nqp\nurgent\n", 'ls-label shows qp');
- lei_ok qw(tag -F eml t/utf8.eml +L:INBOX +L:x);
+ lei_ok qw(tag -F eml t/utf8.eml +L:inbox +L:x);
lei_ok qw(q m:testmessage@example.com);
- $check_kw->([qw(answered seen)], L => [qw(INBOX nope urgent x)]);
+ $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');
+ is($lei_out, "inbox\nnope\nqp\nurgent\nx\n", 'ls-label shows qp');
+
+ lei_ok qw(q L:inbox);
+ is(json_utf8->decode($lei_out)->[0]->{blob},
+ $r2->[0]->{blob}, 'label search works');
+
+ ok(!lei(qw(tag -F eml t/utf8.eml +L:ALLCAPS)), '+L:ALLCAPS fails');
+ lei_ok(qw(ls-label));
+ is($lei_out, "inbox\nnope\nqp\nurgent\nx\n", 'ls-label unchanged');
if (0) { # TODO label+kw search w/ externals
lei_ok(qw(q L:qp), "mid:$mid", '--only', "$ro_home/t2");
prev parent reply other threads:[~2021-10-31 9:26 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-31 9:10 [PATCH 0/2] lei: mail-sync docs + compat fix Eric Wong
2021-10-31 9:10 ` [PATCH 1/2] doc: add lei-mail-sync-overview manpage Eric Wong
2021-10-31 16:32 ` Kyle Meyer
2021-10-31 17:30 ` Eric Wong
2021-10-31 9:10 ` [PATCH 2/2] lei_input: disallow uppercase characters for labels Eric Wong
2021-10-31 9:26 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211031092658.M569433@dcvr \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).