update copyright headers and email addresses

[public-inbox.git] / lib / PublicInbox / SearchMsg.pm

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 4ad8a0c95e898249fdd2b9a889bf148ff01138f4..e3a04605b9b0925efdd97e390ba38496b94331ef 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -1,4 +1,4 @@
-# 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;
@@ -9,10 +9,11 @@ use Email::Address qw//;
 use Email::Simple qw//;
 use POSIX qw//;
 use Date::Parse qw/str2time/;
-use PublicInbox::MID qw/mid_clean mid_compress/;
+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) = @_;
@@ -30,13 +31,17 @@ sub wrap {
 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, $refs) = 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;
@@ -77,27 +82,13 @@ sub from_name {
 
 sub ts {
        my ($self) = @_;
-       my $ts = $self->{ts};
-       return $ts if $ts;
-       $self->{ts} = eval {
-               str2time($self->date || $self->mime->header('Date'))
-       } || 0;
-}
-
-sub date {
-       my ($self) = @_;
-       my $date = $self->{date};
-       return $date if $date;
-       my $ts = eval { str2time($self->mime->header('Date')) };
-       $self->{date} = POSIX::strftime('%Y-%m-%d %H:%M', gmtime($ts));
+       $self->{ts} ||= eval { str2time($self->mime->header('Date')) } || 0;
 }
 
 sub to_doc_data {
        my ($self) = @_;
-       $self->mid . "\n" .
        PublicInbox::Search::subject_summary($self->subject) . "\n" .
        $self->from_name . "\n".
-       $self->date . "\n" .
        $self->references_sorted;
 }
 
@@ -136,17 +127,31 @@ sub ensure_metadata {
 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_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.
 
-       my $refs = $self->{references_sorted};
-       my $mime = Email::MIME->create(header_str => \@h);
-       $mime->header_set('References', $refs) if (defined $refs);
+       # drop useless headers Email::MIME set for us
+       $h->header_set('Date');
+       $h->header_set('MIME-Version');
        $mime;
 }
 
@@ -155,6 +160,8 @@ 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;
@@ -165,7 +172,7 @@ sub _extract_mid {
        my ($self) = @_;
 
        my $mid = $self->mime->header('Message-ID');
-       $mid ? mid_compress(mid_clean($mid)) : $mid;
+       defined $mid ? mid_clean($mid) : $mid;
 }
 
 sub mime {