* [PATCH] lei mark: relax label requirements
@ 2021-03-27 23:22 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2021-03-27 23:22 UTC (permalink / raw)
To: meta
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");
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-27 23:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-27 23:22 [PATCH] lei mark: relax label requirements Eric Wong
unofficial mirror of meta@public-inbox.org
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://yhetil.org/meta
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V1 meta meta/ https://yhetil.org/meta \
meta@public-inbox.org
public-inbox-index meta
Example config snippet for mirrors.
Newsgroups are available over NNTP:
nntp://news.yhetil.org/yhetil.mail.public-inbox.meta
nntp://news.public-inbox.org/inbox.mail.public-inbox.meta
nntp://news.gmane.io/gmane.mail.public-inbox.general
AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git