user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] watch: use "publicinboxwatch" namespace
Date: Thu,  1 Sep 2016 19:33:23 +0000	[thread overview]
Message-ID: <20160901193323.14191-1-e@80x24.org> (raw)

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


                 reply	other threads:[~2016-09-01 19:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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: https://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=20160901193323.14191-1-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).