* [PATCH 3/3] watchmaildir: normalize Maildir pathnames consistently
2019-01-05 8:36 7% [PATCH 0/3] some watch fixes and improvements Eric Wong
@ 2019-01-05 8:36 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-01-05 8:36 UTC (permalink / raw)
To: meta
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
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] some watch fixes and improvements
@ 2019-01-05 8:36 7% Eric Wong
2019-01-05 8:36 7% ` [PATCH 3/3] watchmaildir: normalize Maildir pathnames consistently Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-01-05 8:36 UTC (permalink / raw)
To: meta
Most notably, -watch now supports a Maildir with multiple lists.
(works better with the "watcheader" directive).
It should probably resolve symlinks in the future, too;
since I seem to recall some weirdness in that + Filesys::Notify::Simple
Eric Wong (3):
watchmaildir: support multiple inboxes in the same Maildir
watchmaildir: get rid of unused spamdir field
watchmaildir: normalize Maildir pathnames consistently
lib/PublicInbox/WatchMaildir.pm | 71 ++++++++++++++++++++-------------
t/watch_maildir.t | 9 +++++
t/watch_maildir_v2.t | 38 ++++++++++++++++--
3 files changed, 88 insertions(+), 30 deletions(-)
--
EW
^ permalink raw reply [relevance 7%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-01-05 8:36 7% [PATCH 0/3] some watch fixes and improvements Eric Wong
2019-01-05 8:36 7% ` [PATCH 3/3] watchmaildir: normalize Maildir pathnames consistently Eric Wong
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).