about summary refs log tree commit homepage
diff options
context:
space:
mode:
-rw-r--r--MANIFEST1
-rw-r--r--lib/PublicInbox/AltId.pm20
-rw-r--r--lib/PublicInbox/Filter/RubyLang.pm22
-rw-r--r--t/altid_v2.t55
4 files changed, 88 insertions, 10 deletions
diff --git a/MANIFEST b/MANIFEST
index b17f1bea..82cc67d3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -135,6 +135,7 @@ scripts/ssoma-replay
 scripts/xhdr-num2mid
 t/address.t
 t/altid.t
+t/altid_v2.t
 t/cgi.t
 t/check-www-inbox.perl
 t/common.perl
diff --git a/lib/PublicInbox/AltId.pm b/lib/PublicInbox/AltId.pm
index d1b2dc24..f8aa4cb8 100644
--- a/lib/PublicInbox/AltId.pm
+++ b/lib/PublicInbox/AltId.pm
@@ -22,17 +22,31 @@ sub new {
         } split(/[&;]/, $query);
         my $f = $params{file} or die "file: required for $type spec $spec\n";
         unless (index($f, '/') == 0) {
-                $f = "$inbox->{mainrepo}/public-inbox/$f";
+                if (($inbox->{version} || 1) == 1) {
+                        $f = "$inbox->{mainrepo}/public-inbox/$f";
+                } else {
+                        $f = "$inbox->{mainrepo}/$f";
+                }
         }
         bless {
-                mm_alt => PublicInbox::Msgmap->new_file($f, $writable),
+                filename => $f,
+                writable => $writable,
                 xprefix => 'X'.uc($prefix),
         }, $class;
 }
 
+sub mm_alt {
+        my ($self) = @_;
+        $self->{mm_alt} ||= eval {
+                my $f = $self->{filename};
+                my $writable = $self->{filename};
+                PublicInbox::Msgmap->new_file($f, $writable);
+        };
+}
+
 sub mid2alt {
         my ($self, $mid) = @_;
-        $self->{mm_alt}->num_for($mid);
+        $self->mm_alt->num_for($mid);
 }
 
 1;
diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm
index 63e8d422..cb69e38a 100644
--- a/lib/PublicInbox/Filter/RubyLang.pm
+++ b/lib/PublicInbox/Filter/RubyLang.pm
@@ -6,6 +6,7 @@ package PublicInbox::Filter::RubyLang;
 use base qw(PublicInbox::Filter::Base);
 use strict;
 use warnings;
+use PublicInbox::MID qw(mids);
 
 my $l1 = qr/Unsubscribe:\s
         <mailto:ruby-\w+-request\@ruby-lang\.org\?subject=unsubscribe>/x;
@@ -44,16 +45,23 @@ sub scrub {
         my $altid = $self->{-altid};
         if ($altid) {
                 my $hdr = $mime->header_obj;
-                my $mid = $hdr->header_raw('Message-ID');
-                unless (defined $mid) {
-                        return $self->REJECT('Message-Id missing');
+                my $mids = mids($hdr);
+                return $self->REJECT('Message-ID missing') unless (@$mids);
+                my @v = $hdr->header_raw('X-Mail-Count');
+                my $n;
+                foreach (@v) {
+                        /\A\s*(\d+)\s*\z/ or next;
+                        $n = $1;
+                        last;
                 }
-                my $n = $hdr->header_raw('X-Mail-Count');
-                if (!defined($n) || $n !~ /\A\s*\d+\s*\z/) {
+                unless (defined $n) {
                         return $self->REJECT('X-Mail-Count not numeric');
                 }
-                $mid = PublicInbox::MID::mid_clean($mid);
-                $altid->{mm_alt}->mid_set($n, $mid);
+                foreach my $mid (@$mids) {
+                        my $r = $altid->mm_alt->mid_set($n, $mid);
+                        next if $r == 0;
+                        last;
+                }
         }
         $self->ACCEPT($mime);
 }
diff --git a/t/altid_v2.t b/t/altid_v2.t
new file mode 100644
index 00000000..87f1452b
--- /dev/null
+++ b/t/altid_v2.t
@@ -0,0 +1,55 @@
+# Copyright (C) 2016-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 File::Temp qw/tempdir/;
+foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
+        eval "require $mod";
+        plan skip_all => "$mod missing for altid_v2.t" if $@;
+}
+
+use_ok 'PublicInbox::V2Writable';
+use_ok 'PublicInbox::Inbox';
+my $tmpdir = tempdir('pi-altidv2-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $mainrepo = "$tmpdir/inbox";
+my $full = "$tmpdir/inbox/another-nntp.sqlite3";
+my $altid = [ 'serial:gmane:file=another-nntp.sqlite3' ];
+
+{
+        ok(mkdir($mainrepo), 'created repo for msgmap');
+        my $mm = PublicInbox::Msgmap->new_file($full, 1);
+        is($mm->mid_set(1234, 'a@example.com'), 1, 'mid_set once OK');
+        ok(0 == $mm->mid_set(1234, 'a@example.com'), 'mid_set not idempotent');
+        ok(0 == $mm->mid_set(1, 'a@example.com'), 'mid_set fails with dup MID');
+}
+
+my $ibx = {
+        mainrepo => $mainrepo,
+        name => 'test-v2writable',
+        version => 2,
+        -primary_address => 'test@example.com',
+        altid => $altid,
+};
+$ibx = PublicInbox::Inbox->new($ibx);
+my $v2w = PublicInbox::V2Writable->new($ibx, 1);
+$v2w->add(Email::MIME->create(
+                header => [
+                        From => 'a@example.com',
+                        To => 'b@example.com',
+                        'Content-Type' => 'text/plain',
+                        Subject => 'boo!',
+                        'Message-ID' => '<a@example.com>',
+                ],
+                body => "hello world gmane:666\n",
+        ));
+$v2w->done;
+
+my $msgs = $ibx->search->reopen->query("gmane:1234");
+is_deeply([map { $_->mid } @$msgs], ['a@example.com'], 'got one match');
+$msgs = $ibx->search->query("gmane:666");
+is_deeply([], $msgs, 'body did NOT match');
+
+done_testing();
+
+1;