[PATCH] watch: use "publicinboxwatch" namespace

[PATCH] watch: use "publicinboxwatch" namespace

[Eric Wong]

We'll keep supporting "publicinboxlearn" indefinitely,
but "publicinboxwatch" is probably more appropriate
at the moment.

Noticed while writing documentation.
---
 lib/PublicInbox/WatchMaildir.pm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index f34419a..c8ea3ed 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -18,21 +18,25 @@ sub new {
 	my ($class, $config) = @_;
 	my (%mdmap, @mdir, $spamc);
 
-	# XXX is "publicinboxlearn" really a good namespace for this?
-	my $k = 'publicinboxlearn.watchspam';
-	if (my $spamdir = $config->{$k}) {
-		if ($spamdir =~ s/\Amaildir://) {
-			$spamdir =~ s!/+\z!!;
-			# skip "new", no MUA has seen it, yet.
-			my $cur = "$spamdir/cur";
-			push @mdir, $cur;
-			$mdmap{$cur} = 'watchspam';
-		} else {
-			warn "unsupported $k=$spamdir\n";
+	# "publicinboxwatch" is the documented namespace
+	# "publicinboxlearn" is legacy but may be supported
+	# indefinitely...
+	foreach my $pfx (qw(publicinboxwatch publicinboxlearn)) {
+		my $k = "$pfx.watchspam";
+		if (my $spamdir = $config->{$k}) {
+			if ($spamdir =~ s/\Amaildir://) {
+				$spamdir =~ s!/+\z!!;
+				# skip "new", no MUA has seen it, yet.
+				my $cur = "$spamdir/cur";
+				push @mdir, $cur;
+				$mdmap{$cur} = 'watchspam';
+			} else {
+				warn "unsupported $k=$spamdir\n";
+			}
 		}
 	}
 
-	$k = 'publicinboxwatch.spamcheck';
+	my $k = 'publicinboxwatch.spamcheck';
 	my $spamcheck = $config->{$k};
 	if ($spamcheck) {
 		if ($spamcheck eq 'spamc') {
-- 
EW