my $inboxdir = "$tmpdir/v2";
my $maildir = "$tmpdir/md";
my $spamdir = "$tmpdir/spam";
-use_ok 'PublicInbox::WatchMaildir';
+use_ok 'PublicInbox::Watch';
use_ok 'PublicInbox::Emergency';
my $cfgpfx = "publicinbox.test";
my $addr = 'test-public@example.com';
my $config = PublicInbox::Config->new(\$orig);
my $ibx = $config->lookup_name('test');
ok($ibx, 'found inbox by name');
-my $srch = $ibx->search;
-PublicInbox::WatchMaildir->new($config)->scan('full');
-my ($total, undef) = $srch->reopen->query('');
+PublicInbox::Watch->new($config)->scan('full');
+my $total = scalar @{$ibx->over->recent};
is($total, 1, 'got one revision');
# my $git = PublicInbox::Git->new("$inboxdir/git/0.git");
};
$write_spam->();
is(unlink(glob("$maildir/new/*")), 1, 'unlinked old spam');
-PublicInbox::WatchMaildir->new($config)->scan('full');
-is(($srch->reopen->query(''))[0], 0, 'deleted file');
+PublicInbox::Watch->new($config)->scan('full');
+is_deeply($ibx->over->recent, [], 'deleted file');
is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
# check with scrubbing
the body of a message to majordomo\@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html\n);
PublicInbox::Emergency->new($maildir)->prepare(\$msg);
- PublicInbox::WatchMaildir->new($config)->scan('full');
- my ($nr, $msgs) = $srch->reopen->query('');
- is($nr, 1, 'got one file back');
+ PublicInbox::Watch->new($config)->scan('full');
+ my $msgs = $ibx->over->recent;
+ is(scalar(@$msgs), 1, 'got one file back');
my $mref = $ibx->msg_by_smsg($msgs->[0]);
like($$mref, qr/something\n\z/s, 'message scrubbed on import');
is(unlink(glob("$maildir/new/*")), 1, 'unlinked spam');
$write_spam->();
- PublicInbox::WatchMaildir->new($config)->scan('full');
- ($nr, $msgs) = $srch->reopen->query('');
- is($nr, 0, 'inbox is empty again');
+ PublicInbox::Watch->new($config)->scan('full');
+ $msgs = $ibx->over->recent;
+ is(scalar(@$msgs), 0, 'inbox is empty again');
is(unlink(glob("$spamdir/cur/*")), 1, 'unlinked trained spam');
}
$config->{'publicinboxwatch.spamcheck'} = 'spamc';
{
local $SIG{__WARN__} = sub {}; # quiet spam check warning
- PublicInbox::WatchMaildir->new($config)->scan('full');
+ PublicInbox::Watch->new($config)->scan('full');
}
- my ($nr, $msgs) = $srch->reopen->query('');
- is($nr, 0, 'inbox is still empty');
+ my $msgs = $ibx->over->recent;
+ is(scalar(@$msgs), 0, 'inbox is still empty');
is(unlink(glob("$maildir/new/*")), 1);
}
local $ENV{PATH} = $main_path;
PublicInbox::Emergency->new($maildir)->prepare(\$msg);
$config->{'publicinboxwatch.spamcheck'} = 'spamc';
- PublicInbox::WatchMaildir->new($config)->scan('full');
- my ($nr, $msgs) = $srch->reopen->query('');
- is($nr, 1, 'inbox has one mail after spamc OK-ed a message');
+ PublicInbox::Watch->new($config)->scan('full');
+ my $msgs = $ibx->over->recent;
+ is(scalar(@$msgs), 1, 'inbox has one mail after spamc OK-ed a message');
my $mref = $ibx->msg_by_smsg($msgs->[0]);
like($$mref, qr/something\n\z/s, 'message scrubbed on import');
delete $config->{'publicinboxwatch.spamcheck'};
open my $fh, '<', $patch or die "failed to open $patch: $!\n";
$msg = do { local $/; <$fh> };
PublicInbox::Emergency->new($maildir)->prepare(\$msg);
- PublicInbox::WatchMaildir->new($config)->scan('full');
- my ($nr, $msgs) = $srch->reopen->query('dfpost:6e006fd7');
- is($nr, 1, 'diff postimage found');
- my $post = $msgs->[0];
- ($nr, $msgs) = $srch->query('dfpre:090d998b6c2c');
- is($nr, 1, 'diff preimage found');
- is($post->{blob}, $msgs->[0]->{blob}, 'same message');
+ PublicInbox::Watch->new($config)->scan('full');
+ my $post = $ibx->search->reopen->mset('dfpost:6e006fd7');
+ is($post->size, 1, 'diff postimage found');
+ my $pre = $ibx->search->mset('dfpre:090d998b6c2c');
+ is($pre->size, 1, 'diff preimage found');
+ $pre = $ibx->search->mset_to_smsg($ibx, $pre);
+ $post = $ibx->search->mset_to_smsg($ibx, $post);
+ is(scalar(@$pre), 1, 'diff preimage found');
+ is($post->[0]->{blob}, $pre->[0]->{blob}, 'same message');
}
# multiple inboxes in the same maildir
both
EOF
PublicInbox::Emergency->new($maildir)->prepare(\$both);
- PublicInbox::WatchMaildir->new($config)->scan('full');
- my ($total, $msgs) = $srch->reopen->query('m:both@b.com');
+ PublicInbox::Watch->new($config)->scan('full');
+ my $mset = $ibx->search->reopen->mset('m:both@b.com');
+ my $msgs = $ibx->search->mset_to_smsg($ibx, $mset);
my $v1 = $config->lookup_name('v1');
my $msg = $v1->git->cat_file($msgs->[0]->{blob});
is($both, $$msg, 'got original message back from v1');
PublicInbox::Emergency->new($maildir)->prepare(\$want);
PublicInbox::Emergency->new($maildir)->prepare(\$do_not_want);
my $config = PublicInbox::Config->new(\$cfg);
- PublicInbox::WatchMaildir->new($config)->scan('full');
+ PublicInbox::Watch->new($config)->scan('full');
$ibx = $config->lookup_name('test');
my $num = $ibx->mm->num_for('do.want@example.com');
ok(defined $num, 'List-ID matched for watch');
$cfg = $orig."$cfgpfx.watchheader=X-Mailing-List:no\@example.com\n";
$config = PublicInbox::Config->new(\$cfg);
- PublicInbox::WatchMaildir->new($config)->scan('full');
+ PublicInbox::Watch->new($config)->scan('full');
$ibx = $config->lookup_name('test');
$num = $ibx->mm->num_for('do.not.want@example.com');
ok(defined $num, 'X-Mailing-List matched');