diff options
| author | Eric Wong <e@80x24.org> | 2021-03-27 23:22:38 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2021-03-28 02:43:50 +0000 |
| commit | ba6f3d8379fb9ee8d0f18e3e0d6d77386daf79c9 (patch) | |
| tree | 190b092925bfae9a1778bfa1e19346e196bafc93 | |
| parent | aca6555ed4696ba1f24296a63afa7450a5afde2a (diff) | |
| download | public-inbox-ba6f3d8379fb9ee8d0f18e3e0d6d77386daf79c9.tar.gz | |
It seems safe to use ALLCAPS labels like "INBOX" with Xapian. We'll also allow single-character labels.
| -rw-r--r-- | lib/PublicInbox/LeiMark.pm | 2 | ||||
| -rw-r--r-- | t/lei-mark.t | 6 |
2 files changed, 7 insertions, 1 deletions
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"); } |