From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] watchmaildir: normalize Maildir pathnames consistently
Date: Sat, 5 Jan 2019 08:36:49 +0000 [thread overview]
Message-ID: <20190105083649.27331-4-e@80x24.org> (raw)
In-Reply-To: <20190105083649.27331-1-e@80x24.org>
Remove redundant slashes while we're at it.
---
lib/PublicInbox/WatchMaildir.pm | 13 +++++++++----
t/watch_maildir.t | 9 +++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 8d8e817..84080ba 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -28,8 +28,7 @@ sub new {
foreach my $pfx (qw(publicinboxwatch publicinboxlearn)) {
my $k = "$pfx.watchspam";
if (my $dir = $config->{$k}) {
- if ($dir =~ s/\Amaildir://) {
- $dir =~ s!/+\z!!;
+ if (is_maildir($dir)) {
# skip "new", no MUA has seen it, yet.
my $cur = "$dir/cur";
my $old = $mdmap{$cur};
@@ -60,8 +59,7 @@ sub new {
my $ibx = $_[0] = PublicInbox::InboxWritable->new($_[0]);
my $watch = $ibx->{watch} or return;
- if ($watch =~ s/\Amaildir://) {
- $watch =~ s!/+\z!!;
+ if (is_maildir($watch)) {
if (my $wm = $ibx->{watchheader}) {
my ($k, $v) = split(/:/, $wm, 2);
$ibx->{-watchheader} = [ $k, qr/\Q$v\E/ ];
@@ -278,4 +276,11 @@ sub _spamcheck_cb {
}
}
+sub is_maildir {
+ $_[0] =~ s!\Amaildir:!! or return;
+ $_[0] =~ tr!/!/!s;
+ $_[0] =~ s!/\z!!;
+ $_[0];
+}
+
1;
diff --git a/t/watch_maildir.t b/t/watch_maildir.t
index 7178f29..b85ddc5 100644
--- a/t/watch_maildir.t
+++ b/t/watch_maildir.t
@@ -124,4 +124,13 @@ More majordomo info at http://vger.kernel.org/majordomo-info.html\n);
like($$mref, qr/something\n\z/s, 'message scrubbed on import');
}
+sub is_maildir {
+ my ($dir) = @_;
+ PublicInbox::WatchMaildir::is_maildir($dir);
+}
+
+is(is_maildir('maildir:/hello//world'), '/hello/world', 'extra slash gone');
+is(is_maildir('maildir:/hello/world/'), '/hello/world', 'trailing slash gone');
+is(is_maildir('faildir:/hello/world/'), undef, 'non-maildir rejected');
+
done_testing;
--
EW
prev parent reply other threads:[~2019-01-05 8:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-05 8:36 [PATCH 0/3] some watch fixes and improvements Eric Wong
2019-01-05 8:36 ` [PATCH 1/3] watchmaildir: support multiple inboxes in the same Maildir Eric Wong
2019-01-05 8:36 ` [PATCH 2/3] watchmaildir: get rid of unused spamdir field Eric Wong
2019-01-05 8:36 ` 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: http://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=20190105083649.27331-4-e@80x24.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).