mda: support v2 inboxes

I mainly focus on -watch for mirroring busy mailing lists, but
using -mda should remain an option.

diff --git a/MANIFEST b/MANIFEST
index ce6cd116780bd2ef097e9b2085bd2dd659a3a5a4..ad145f790f034ee831b4c56068cf9ef009e5f236 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -186,6 +186,7 @@ t/spawn.t
 t/thread-all.t
 t/thread-cycle.t
 t/utf8.mbox
+t/v2mda.t
 t/v2reindex.t
 t/v2writable.t
 t/view.t

diff --git a/lib/PublicInbox/Emergency.pm b/lib/PublicInbox/Emergency.pm
index 231b419741638c0a65059fd97f844a98b5e6c0c5..66adc6318076a395aa9c6be81d7a483bff6a151c 100644 (file)
--- a/lib/PublicInbox/Emergency.pm
+++ b/lib/PublicInbox/Emergency.pm
@@ -18,7 +18,7 @@ sub new {
                next if -d $d;
                -d $d or mkdir($d) or die "failed to mkdir($d): $!\n";
        }
-       bless { dir => $dir, files => {}, t => 0, cnt => 0 }, $class;
+       bless { dir => $dir, files => {}, t => 0, cnt => 0, pid => $$ }, $class;
 }
 
 sub _fn_in {
@@ -75,6 +75,7 @@ sub fh {
 
 sub commit {
        my ($self) = @_;
+       $$ == $self->{pid} or return; # no-op in forked child
 
        delete $self->{fh};
        my $tmp = delete $self->{tmp} or return;

diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index f1eaf629b34012a696eb59ef6af85bc13e6cb7e4..766d58a6f4c22cd97ca91a9fda6dc7bd421d8bca 100755 (executable)
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -78,8 +78,18 @@ if (ref($ret) && $ret->isa('Email::MIME')) { # filter altered message
 } # else { accept
 
 PublicInbox::MDA->set_list_headers($mime, $dst);
-my $git = PublicInbox::Git->new($main_repo);
-my $im = PublicInbox::Import->new($git, $dst->{name}, $recipient);
+my $v = $dst->{version} || 1;
+my $im;
+if ($v == 2) {
+       require PublicInbox::V2Writable;
+       $im = PublicInbox::V2Writable->new($dst);
+       $im->{parallel} = 0; # pointless to be parallel for a single message
+} elsif ($v == 1) {
+       my $git = $dst->git;
+       $im = PublicInbox::Import->new($git, $dst->{name}, $recipient, $dst);
+} else {
+       die "Unsupported inbox version: $v\n";
+}
 if (defined $im->add($mime)) {
        $emm = $emm->abort;
 } else {

diff --git a/t/v2mda.t b/t/v2mda.t
new file mode 100644 (file)
index 0000000..be27ca0
--- /dev/null
+++ b/t/v2mda.t
@@ -0,0 +1,59 @@
+# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+use strict;
+use warnings;
+use Test::More;
+use PublicInbox::MIME;
+use File::Temp qw/tempdir/;
+use Fcntl qw(SEEK_SET);
+use Cwd;
+
+foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
+       eval "require $mod";
+       plan skip_all => "$mod missing for v2mda.t" if $@;
+}
+use_ok 'PublicInbox::V2Writable';
+my $tmpdir = tempdir('pi-v2mda-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $ibx = {
+       mainrepo => "$tmpdir/inbox",
+       name => 'test-v2writable',
+       address => [ 'test@example.com' ],
+};
+my $mime = PublicInbox::MIME->create(
+       header => [
+               From => 'a@example.com',
+               To => 'test@example.com',
+               Subject => 'this is a subject',
+               Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
+               'Message-ID' => '<foo@bar>',
+               'List-ID' => '<test.example.com>',
+       ],
+       body => "hello world\n",
+);
+
+my $mda = "blib/script/public-inbox-mda";
+ok(-f "blib/script/public-inbox-mda", '-mda exists');
+my $main_bin = getcwd()."/t/main-bin";
+local $ENV{PI_DIR} = "$tmpdir/foo";
+local $ENV{PATH} = "$main_bin:blib/script:$ENV{PATH}";
+my @cmd = (qw(public-inbox-init -V2), $ibx->{name},
+               $ibx->{mainrepo}, 'http://localhost/test',
+               $ibx->{address}->[0]);
+ok(PublicInbox::Import::run_die(\@cmd), 'initialized v2 inbox');
+
+open my $tmp, '+>', undef or die "failed to open anonymous tempfile: $!";
+ok($tmp->print($mime->as_string), 'wrote to temporary file');
+ok($tmp->flush, 'flushed temporary file');
+ok($tmp->sysseek(0, SEEK_SET), 'seeked');
+
+my $rdr = { 0 => fileno($tmp) };
+local $ENV{ORIGINAL_RECIPIENT} = 'test@example.com';
+ok(PublicInbox::Import::run_die(['public-inbox-mda'], undef, $rdr),
+       'mda delivered a message');
+
+$ibx = PublicInbox::Inbox->new($ibx);
+my $res = $ibx->search->query('');
+my $saved = $ibx->smsg_mime($res->{msgs}->[0]);
+is($saved->{mime}->as_string, $mime->as_string, 'injected message');
+
+done_testing();