#!perl -w
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
use v5.10.1;
use PublicInbox::TestCommon;
use PublicInbox::Eml;
use Fcntl qw(SEEK_SET);
+use PublicInbox::Spawn qw(popen_rd which);
+use List::Util qw(shuffle);
require_mods(qw(DBD::SQLite));
+require PublicInbox::MboxReader;
+require PublicInbox::LeiOverview;
use_ok 'PublicInbox::LeiToMail';
my $from = "Content-Length: 10\nSubject: x\n\nFrom hell\n";
my $noeol = "Subject: x\n\nFrom hell";
my $crlf = $noeol;
$crlf =~ s/\n/\r\n/g;
my $kw = [qw(seen answered flagged)];
-for my $mbox (qw(mboxrd mboxo mboxcl mboxcl2)) {
+my @MBOX = qw(mboxcl2 mboxrd mboxcl mboxo);
+for my $mbox (@MBOX) {
my $m = "eml2$mbox";
my $cb = PublicInbox::LeiToMail->can($m);
my $s = $cb->(PublicInbox::Eml->new($from), $kw);
blah
EOM
my $fn = "$tmpdir/x.mbox";
+my ($mbox) = shuffle(@MBOX); # pick one, shouldn't matter
+my $wcb_get = sub {
+ my ($fmt, $dst) = @_;
+ delete $lei->{dedupe};
+ $lei->{ovv} = bless {
+ fmt => $fmt,
+ dst => $dst
+ }, 'PublicInbox::LeiOverview';
+ my $l2m = PublicInbox::LeiToMail->new($lei);
+ SKIP: {
+ require_mods('Storable', 1);
+ my $dup = Storable::thaw(Storable::freeze($l2m));
+ is_deeply($dup, $l2m, "$fmt round-trips through storable");
+ }
+ $l2m->pre_augment($lei);
+ $l2m->do_augment($lei);
+ $l2m->post_augment($lei);
+ my $cb = $l2m->write_cb($lei);
+ delete $lei->{1};
+ $cb;
+};
+
my $orig = do {
- my $wcb = PublicInbox::LeiToMail->write_cb("mboxcl2:$fn", $lei);
+ my $wcb = $wcb_get->($mbox, $fn);
is(ref $wcb, 'CODE', 'write_cb returned callback');
ok(-f $fn && !-s _, 'empty file created');
$wcb->(\(my $dup = $buf), 'deadbeef', [ qw(seen) ]);
unlink $fn or BAIL_OUT $!;
local $lei->{opt} = { jobs => 2 };
- $wcb = PublicInbox::LeiToMail->write_cb("mboxcl2:$fn", $lei);
- $lei->{dedupe}->prepare_dedupe;
+ $wcb = $wcb_get->($mbox, $fn);
+ ok(-f $fn && !-s _, 'truncated mbox destination');
$wcb->(\($dup = $buf), 'deadbeef', [ qw(seen) ]);
undef $wcb;
open $fh, '<', $fn or BAIL_OUT $!;
- is($raw, do { local $/; <$fh> }, 'jobs > 1');
+ is(do { local $/; <$fh> }, $raw, 'jobs > 1');
$raw;
};
for my $zsfx (qw(gz bz2 xz)) { # XXX should we support zst, zz, lzo, lzma?
my $dc_cmd = eval { $zsfx2cmd->($zsfx, 1, $lei) };
ok($dc_cmd, "decompressor for .$zsfx");
my $f = "$fn.$zsfx";
- my $dst = "mboxcl2:$f";
- my $wcb = PublicInbox::LeiToMail->write_cb($dst, $lei);
+ my $wcb = $wcb_get->($mbox, $f);
$wcb->(\(my $dup = $buf), 'deadbeef', [ qw(seen) ]);
undef $wcb;
my $uncompressed = xqx([@$dc_cmd, $f]);
local $lei->{opt} = { jobs => 2 }; # for atomic writes
unlink $f or BAIL_OUT "unlink $!";
- $wcb = PublicInbox::LeiToMail->write_cb($dst, $lei);
- $lei->{dedupe}->prepare_dedupe;
+ $wcb = $wcb_get->($mbox, $f);
$wcb->(\($dup = $buf), 'deadbeef', [ qw(seen) ]);
undef $wcb;
is(xqx([@$dc_cmd, $f]), $orig, "$zsfx matches with lock");
+
+ local $lei->{opt} = { augment => 1 };
+ $wcb = $wcb_get->($mbox, $f);
+ $wcb->(\($dup = $buf . "\nx\n"), 'deadbeef', [ qw(seen) ]);
+ undef $wcb; # commit
+
+ my $cat = popen_rd([@$dc_cmd, $f]);
+ my @raw;
+ PublicInbox::MboxReader->$mbox($cat,
+ sub { push @raw, shift->as_string });
+ like($raw[1], qr/\nblah\n\nx\n\z/s, "augmented $zsfx");
+ like($raw[0], qr/\nblah\n\z/s, "original preserved $zsfx");
+
+ local $lei->{opt} = { augment => 1, jobs => 2 };
+ $wcb = $wcb_get->($mbox, $f);
+ $wcb->(\($dup = $buf . "\ny\n"), 'deadbeef', [ qw(seen) ]);
+ undef $wcb; # commit
+
+ my @raw3;
+ $cat = popen_rd([@$dc_cmd, $f]);
+ PublicInbox::MboxReader->$mbox($cat,
+ sub { push @raw3, shift->as_string });
+ my $y = pop @raw3;
+ is_deeply(\@raw3, \@raw, 'previous messages preserved');
+ like($y, qr/\nblah\n\ny\n\z/s, "augmented $zsfx (atomic)");
}
}
unlink $fn or BAIL_OUT $!;
-require PublicInbox::MboxReader;
if ('default deduplication uses content_hash') {
- my $wcb = PublicInbox::LeiToMail->write_cb("mboxo:$fn", $lei);
+ my $wcb = $wcb_get->('mboxo', $fn);
$wcb->(\(my $x = $buf), 'deadbeef', []) for (1..2);
undef $wcb; # undef to commit changes
my $cmp = '';
open my $fh, '<', $fn or BAIL_OUT $!;
PublicInbox::MboxReader->mboxo($fh, sub { $cmp .= shift->as_string });
is($cmp, $buf, 'only one message written');
+
+ local $lei->{opt} = { augment => 1 };
+ $wcb = $wcb_get->('mboxo', $fn);
+ $wcb->(\($x = $buf . "\nx\n"), 'deadbeef', []) for (1..2);
+ undef $wcb; # undef to commit changes
+ open $fh, '<', $fn or BAIL_OUT $!;
+ my @x;
+ PublicInbox::MboxReader->mboxo($fh, sub { push @x, shift->as_string });
+ is(scalar(@x), 2, 'augmented mboxo');
+ is($x[0], $cmp, 'original message preserved');
+ is($x[1], $buf . "\nx\n", 'new message appended');
}
{ # stdout support
open my $tmp, '+>', undef or BAIL_OUT $!;
local $lei->{1} = $tmp;
- my $wcb = PublicInbox::LeiToMail->write_cb("mboxrd:/dev/stdout", $lei);
+ my $wcb = $wcb_get->('mboxrd', '/dev/stdout');
$wcb->(\(my $x = $buf), 'deadbeef', []);
undef $wcb; # commit
seek($tmp, 0, SEEK_SET) or BAIL_OUT $!;
}
SKIP: { # FIFO support
- use PublicInbox::Spawn qw(popen_rd which);
use POSIX qw(mkfifo);
my $fn = "$tmpdir/fifo";
mkfifo($fn, 0600) or skip("mkfifo not supported: $!", 1);
my $cat = popen_rd([which('cat'), $fn]);
- my $wcb = PublicInbox::LeiToMail->write_cb("mboxo:$fn", $lei);
+ my $wcb = $wcb_get->('mboxo', $fn);
$wcb->(\(my $x = $buf), 'deadbeef', []);
undef $wcb; # commit
my $cmp = '';
is($cmp, $buf, 'message written to FIFO');
}
+{ # Maildir support
+ my $md = "$tmpdir/maildir/";
+ my $wcb = $wcb_get->('maildir', $md);
+ is(ref($wcb), 'CODE', 'got Maildir callback');
+ $wcb->(\(my $x = $buf), 'badc0ffee', []);
+
+ my @f;
+ PublicInbox::LeiToMail::_maildir_each_file($md, sub { push @f, shift });
+ open my $fh, $f[0] or BAIL_OUT $!;
+ is(do { local $/; <$fh> }, $buf, 'wrote to Maildir');
+
+ $wcb = $wcb_get->('maildir', $md);
+ $wcb->(\($x = $buf."\nx\n"), 'deadcafe', []);
+
+ my @x = ();
+ PublicInbox::LeiToMail::_maildir_each_file($md, sub { push @x, shift });
+ is(scalar(@x), 1, 'wrote one new file');
+ ok(!-f $f[0], 'old file clobbered');
+ open $fh, $x[0] or BAIL_OUT $!;
+ is(do { local $/; <$fh> }, $buf."\nx\n", 'wrote new file to Maildir');
+
+ local $lei->{opt}->{augment} = 1;
+ $wcb = $wcb_get->('maildir', $md);
+ $wcb->(\($x = $buf."\ny\n"), 'deadcafe', []);
+ $wcb->(\($x = $buf."\ny\n"), 'b4dc0ffee', []); # skipped by dedupe
+ @f = ();
+ PublicInbox::LeiToMail::_maildir_each_file($md, sub { push @f, shift });
+ is(scalar grep(/\A\Q$x[0]\E\z/, @f), 1, 'old file still there');
+ my @new = grep(!/\A\Q$x[0]\E\z/, @f);
+ is(scalar @new, 1, '1 new file written (b4dc0ffee skipped)');
+ open $fh, $x[0] or BAIL_OUT $!;
+ is(do { local $/; <$fh> }, $buf."\nx\n", 'old file untouched');
+ open $fh, $new[0] or BAIL_OUT $!;
+ is(do { local $/; <$fh> }, $buf."\ny\n", 'new file written');
+}
+
done_testing;