-# Copyright (C) 2015, all contributors <meta@public-inbox.org>
+# Copyright (C) 2015 all contributors <meta@public-inbox.org>
# License: GPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
# based on notmuch, but with no concept of folders, files or flags
package PublicInbox::SearchMsg;
use Email::Simple qw//;
use POSIX qw//;
use Date::Parse qw/str2time/;
-use PublicInbox::MID qw/mid_clean mid_compressed/;
+use PublicInbox::MID qw/mid_clean/;
use Encode qw/find_encoding/;
my $enc_utf8 = find_encoding('UTF-8');
our $PFX2TERM_RE = undef;
+use constant EPOCH_822 => 'Thu, 01 Jan 1970 00:00:00 +0000';
sub new {
my ($class, $mime) = @_;
sub load_doc {
my ($class, $doc) = @_;
my $data = $doc->get_data;
+ my $ts = eval {
+ no strict 'subs';
+ $doc->get_value(PublicInbox::Search::TS);
+ };
+ $ts = Search::Xapian::sortable_unserialise($ts);
$data = $enc_utf8->decode($data);
- my ($mid, $subj, $from, $date) = split(/\n/, $data);
+ my ($subj, $from, $refs) = split(/\n/, $data);
bless {
doc => $doc,
- mid => $mid,
subject => $subj,
- date => $date,
+ ts => $ts,
from_name => $from,
+ references_sorted => $refs,
}, $class;
}
sub ts {
my ($self) = @_;
- my $ts = $self->{ts};
- return $ts if $ts;
- $self->{date} = undef;
- $self->date;
- $self->{ts};
+ $self->{ts} ||= eval { str2time($self->mime->header('Date')) } || 0;
}
-sub date {
+sub to_doc_data {
my ($self) = @_;
- my $date = $self->{date};
- return $date if $date;
- my $ts = eval { str2time($self->mime->header('Date')) } || 0;
- $self->{ts} = $ts;
- $self->{date} = POSIX::strftime('%Y-%m-%d %H:%M', gmtime($ts));
+ PublicInbox::Search::subject_summary($self->subject) . "\n" .
+ $self->from_name . "\n".
+ $self->references_sorted;
}
-sub to_doc_data {
+sub references_sorted {
my ($self) = @_;
-
- $self->mid . "\n" .
- $self->subject . "\n" .
- $self->from_name . "\n".
- $self->date;
+ my $x = $self->{references_sorted};
+ defined $x ? $x : '';
}
sub ensure_metadata {
my ($self) = @_;
my $doc = $self->{doc};
- my $i = $doc->termlist_begin;
my $end = $doc->termlist_end;
unless (defined $PFX2TERM_RE) {
$PFX2TERM_RE = qr/\A($or)/;
}
- for (; $i != $end; $i->inc) {
- my $val = $i->get_termname;
+ while (my ($pfx, $field) = each %PublicInbox::Search::PFX2TERM_RMAP) {
+ # ideally we'd move this out of the loop:
+ my $i = $doc->termlist_begin;
+
+ $i->skip_to($pfx);
+ if ($i != $end) {
+ my $val = $i->get_termname;
- if ($val =~ s/$PFX2TERM_RE//o) {
- my $field = $PublicInbox::Search::PFX2TERM_RMAP{$1};
- if ($field eq 'references') {
- my $refs = $self->{references} ||= [];
- push @$refs, $val;
- } else {
+ if ($val =~ s/$PFX2TERM_RE//o) {
$self->{$field} = $val;
}
}
sub mini_mime {
my ($self) = @_;
$self->ensure_metadata;
- my @h = (
- Subject => $self->subject,
+ my @hs = (
+ 'Subject' => $self->subject,
'X-PI-From' => $self->from_name,
- 'X-PI-Date' => $self->date,
- 'X-PI-TS' => $self->ts,
+ );
+
+ my @h = (
+ # prevent Email::Simple::Creator from running,
+ # this header is useless for threading as we use X-PI-TS
+ # for sorting and display:
+ 'Date' => EPOCH_822,
'Message-ID' => "<$self->{mid}>",
+ 'X-PI-TS' => $self->ts,
);
- if (my $refs = $self->{references}) {
- push @h, References => '<' . join('> <', @$refs) . '>';
- }
- if (my $irt = $self->{inreplyto}) {
- push @h, 'In-Reply-To' => "<$irt>";
+ if (my $refs = $self->{references_sorted}) {
+ push @h, References => $refs;
}
+ my $mime = Email::MIME->create(header_str => \@hs, header => \@h);
+ my $h = $mime->header_obj;
+
+ # set these headers manually since Encode::encode('MIME-Q', ...)
+ # will add spaces to long values when using header_str above.
- Email::MIME->create(header_str => \@h);
+ # drop useless headers Email::MIME set for us
+ $h->header_set('Date');
+ $h->header_set('MIME-Version');
+ $mime;
}
sub mid {
if (defined $mid) {
$self->{mid} = $mid;
+ } elsif (my $rv = $self->{mid}) {
+ $rv;
} else {
$self->ensure_metadata; # needed for ghosts
$self->{mid} ||= $self->_extract_mid;
my ($self) = @_;
my $mid = $self->mime->header('Message-ID');
- $mid ? mid_compressed(mid_clean($mid)) : $mid;
+ defined $mid ? mid_clean($mid) : $mid;
}
sub mime {