From 62620b9437bfd0f212ad8113d4f51aa079d0d142 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Wed, 16 May 2018 05:33:32 +0000
Subject: learn: support for v2 repos

Oops, I mainly rely on public-inbox-watch for spam training
and completely forgot this tool existed :x
---
 script/public-inbox-learn | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'script/public-inbox-learn')

diff --git a/script/public-inbox-learn b/script/public-inbox-learn
index c51f9585..74534705 100755
--- a/script/public-inbox-learn
+++ b/script/public-inbox-learn
@@ -8,8 +8,7 @@ my $usage = "$0 (spam|ham) < /path/to/message";
 use strict;
 use warnings;
 use PublicInbox::Config;
-use PublicInbox::Git;
-use PublicInbox::Import;
+use PublicInbox::InboxWritable;
 use PublicInbox::MIME;
 use PublicInbox::Address;
 use PublicInbox::Spamcheck::Spamc;
@@ -52,10 +51,8 @@ foreach my $h (qw(Cc To)) {
 if ($train eq 'spam') {
 	$pi_config->each_inbox(sub {
 		my ($ibx) = @_;
-		my $git = $ibx->git;
-		my $name = $ibx->{name};
-		my $addr = $ibx->{-primary_address};
-		my $im = PublicInbox::Import->new($git, $name, $addr, $ibx);
+		$ibx = PublicInbox::InboxWritable->new($ibx);
+		my $im = $ibx->importer(0);
 		$im->remove($mime, 'spam');
 		$im->done;
 	});
@@ -66,13 +63,12 @@ require PublicInbox::MDA if $train eq "ham";
 # n.b. message may be cross-posted to multiple public-inboxes
 foreach my $recipient (keys %dests) {
 	my $dst = $pi_config->lookup($recipient) or next;
-	my $git_dir = $dst->{mainrepo} or next;
-	my $git = PublicInbox::Git->new($git_dir);
 	# We do not touch GIT_COMMITTER_* env here so we can track
 	# who trained the message.
-	my $name = $ENV{GIT_COMMITTER_NAME} || $dst->{name};
-	my $email = $ENV{GIT_COMMITTER_EMAIL} || $recipient;
-	my $im = PublicInbox::Import->new($git, $name, $email);
+	$dst->{name} = $ENV{GIT_COMMITTER_NAME} || $dst->{name};
+	$dst->{-primary_address} = $ENV{GIT_COMMITTER_EMAIL} || $recipient;
+	$dst = PublicInbox::InboxWritable->new($dst);
+	my $im = $dst->importer(0);
 
 	if ($train eq "spam" || $train eq "rm") {
 		# This needs to be idempotent, as my inotify trainer
-- 
cgit v1.2.3-24-ge0c7