about summary refs log tree commit homepage
path: root/lib/PublicInbox/WatchMaildir.pm
diff options
context:
space:
mode:
Diffstat (limited to 'lib/PublicInbox/WatchMaildir.pm')
-rw-r--r--lib/PublicInbox/WatchMaildir.pm13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 8d8e817a..84080ba9 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;