use strict;
use warnings;
use Test::More;
-use PublicInbox::MIME;
-use PublicInbox::ContentId qw(content_digest content_id);
+use PublicInbox::Eml;
+use PublicInbox::ContentHash qw(content_digest content_hash);
use PublicInbox::TestCommon;
use Cwd qw(abs_path);
require_git(2.6);
-primary_address => 'test@example.com',
};
$ibx = PublicInbox::Inbox->new($ibx);
-my $mime = PublicInbox::MIME->create(
- header => [
- From => 'a@example.com',
- To => 'test@example.com',
- Subject => 'this is a subject',
- 'Message-ID' => '<a-mid@b>',
- Date => 'Fri, 02 Oct 1993 00:00:00 +0000',
- ],
- body => "hello world\n",
-);
+my $mime = PublicInbox::Eml->new(<<'EOF');
+From: a@example.com
+To: test@example.com
+Subject: this is a subject
+Message-ID: <a-mid@b>
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+hello world
+EOF
my $im = PublicInbox::V2Writable->new($ibx, {nproc => 1});
is($im->{shards}, 1, 'one shard when forced');
ok($im->add($mime), 'ordinary message added');
if ('ensure git configs are correct') {
my @cmd = (qw(git config), "--file=$inboxdir/all.git/config",
qw(core.sharedRepository 0644));
- is(system(@cmd), 0, "set sharedRepository in all.git");
+ is(xsys(@cmd), 0, "set sharedRepository in all.git");
$git0 = PublicInbox::Git->new("$inboxdir/git/0.git");
chomp(my $v = $git0->qx(qw(config core.sharedRepository)));
is($v, '0644', 'child repo inherited core.sharedRepository');
@warn = ();
$mime->header_set('Message-Id', '<a-mid@b>', '<c@d>');
is($im->add($mime), undef, 'secondary MID ignored if first matches');
- my $sec = PublicInbox::MIME->new($mime->as_string);
+ my $sec = PublicInbox::Eml->new($mime->as_string);
$sec->header_set('Date');
$sec->header_set('Message-Id', '<a-mid@b>', '<c@d>');
ok($im->add($sec), 'secondary MID used if data is different');
my $hdr = $mime->header_obj;
my $gen = PublicInbox::Import::digest2mid(content_digest($mime), $hdr);
unlike($gen, qr![\+/=]!, 'no URL-unfriendly chars in Message-Id');
- my $fake = PublicInbox::MIME->new($mime->as_string);
+ my $fake = PublicInbox::Eml->new($mime->as_string);
$fake->header_set('Message-Id', "<$gen>");
ok($im->add($fake), 'fake added easily');
is_deeply(\@warn, [], 'no warnings from a faker');
@mids = $mime->header_obj->header_raw('Message-Id');
like($mids[0], $sane_mid, 'mid was generated');
is(scalar(@mids), 1, 'new generated');
+
+ @warn = ();
+ $mime->header_set('Message-Id', '<space@ (NXDOMAIN) >');
+ ok($im->add($mime), 'message added with space in Message-Id');
+ is_deeply([], \@warn);
}
{
$mime->header_set('References', '<zz-mid@b>');
ok($im->add($mime), 'message with multiple Message-ID');
$im->done;
- my ($total, undef) = $ibx->over->recent;
+ my $total = $ibx->over->dbh->selectrow_array(<<'');
+SELECT COUNT(*) FROM over WHERE num > 0
+
is($ibx->mm->num_highwater, $total, 'got expected highwater value');
my $srch = $ibx->search;
my $mset1 = $srch->reopen->query('m:abcde@1', { mset => 1 });
is($uniq{$mid}++, 0, "MID for $num is unique in XOVER");
is_deeply($n->xhdr('Message-ID', $num),
{ $num => $mid }, "XHDR lookup OK on num $num");
+
+ # FIXME PublicInbox::NNTP (server) doesn't handle spaces in
+ # Message-ID, but neither does Net::NNTP (client)
+ next if $mid =~ / /;
+
is_deeply($n->xhdr('Message-ID', $mid),
- { $mid => $mid }, "XHDR lookup OK on MID $num");
+ { $mid => $mid }, "XHDR lookup OK on MID $mid ($num)");
}
my %nn;
foreach my $mid (@{$n->newnews(0, $group)}) {
$im = PublicInbox::V2Writable->new($ibx, {nproc => 2});
is($im->{shards}, 1, 'detected single shard from previous');
my ($mark, $rm_mime, $smsg) = $im->remove($mime, 'test removal');
- is(content_id($rm_mime), content_id($mime),
+ is(content_hash($rm_mime), content_hash($mime),
'removed object returned matches');
ok(defined($mark), 'mark set');
$im->done;
like($tip, qr/\A[a-f0-9]+ test removal\n\z/s,
'commit message propagated to git');
is_deeply(\@after, \@before, 'only one commit written to git');
- is($ibx->mm->num_for($smsg->mid), undef, 'no longer in Msgmap by mid');
+ my $mid = $smsg->{mid};
+ is($ibx->mm->num_for($mid), undef, 'no longer in Msgmap by mid');
my $num = $smsg->{num};
like($num, qr/\A\d+\z/, 'numeric number in return message');
is($ibx->mm->mid_for($num), undef, 'no longer in Msgmap by num');
my $srch = $ibx->search->reopen;
- my $mset = $srch->query('m:'.$smsg->mid, { mset => 1});
+ my $mset = $srch->query('m:'.$mid, { mset => 1});
is($mset->size, 0, 'no longer found in Xapian');
my @log1 = (@log, qw(-1 --pretty=raw --raw -r --no-renames));
is($srch->{over_ro}->get_art($num), undef,