Merge branch 'thread-view-skel'

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

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 93be747507bc7c7589afcad39758a3d10dfa7d33..4b0b645e17af961b9bf450f57756fce97acba481 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: GPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # based on notmuch, but with no concept of folders, files or flags
 #
 # Wraps a document inside our Xapian search index.
@@ -7,13 +7,10 @@ package PublicInbox::SearchMsg;
 use strict;
 use warnings;
 use Search::Xapian;
-use Email::Address qw//;
-use Email::Simple qw//;
 use POSIX qw//;
 use Date::Parse qw/str2time/;
 use PublicInbox::MID qw/mid_clean/;
-use Encode qw/find_encoding/;
-my $enc_utf8 = find_encoding('UTF-8');
+use PublicInbox::Address;
 our $PFX2TERM_RE = undef;
 use constant EPOCH_822 => 'Thu, 01 Jan 1970 00:00:00 +0000';
 use POSIX qw(strftime);
@@ -38,9 +35,9 @@ sub get_val ($$) {
 
 sub load_doc {
        my ($class, $doc) = @_;
-       my $data = $doc->get_data;
+       my $data = $doc->get_data or return;
        my $ts = get_val($doc, &PublicInbox::Search::TS);
-       $data = $enc_utf8->decode($data);
+       utf8::decode($data);
        my ($subj, $from, $refs, $to, $cc) = split(/\n/, $data);
        bless {
                doc => $doc,
@@ -66,7 +63,8 @@ sub __hdr ($$) {
        my $mime = $self->{mime} or return;
        $val = $mime->header($field);
        $val = '' unless defined $val;
-       $val =~ tr/\t\r\n/ /;
+       $val =~ tr/\n/ /;
+       $val =~ tr/\r//d;
        $self->{$field} = $val;
 }
 
@@ -80,16 +78,15 @@ sub date ($) {
        return $date if defined $date;
        my $ts = $self->{ts};
        return unless defined $ts;
-       $self->{date} = strftime('%a, %d %b %Y %T %z', gmtime($ts));
+       $self->{date} = strftime('%a, %d %b %Y %T +0000', gmtime($ts));
 }
 
 sub from ($) {
        my ($self) = @_;
        my $from = __hdr($self, 'from');
        if (defined $from && !defined $self->{from_name}) {
-               $from =~ tr/\t\r\n/ /;
-               my @from = Email::Address->parse($from);
-               $self->{from_name} = $from[0]->name;
+               my @n = PublicInbox::Address::names($from);
+               $self->{from_name} = join(', ', @n);
        }
        $from;
 }
@@ -148,12 +145,9 @@ sub ensure_metadata {
 sub mini_mime {
        my ($self) = @_;
        $self->ensure_metadata;
-       my @hs = (
+       my @h = (
                'Subject' => $self->subject,
                'X-PI-From' => $self->from_name,
-       );
-
-       my @h = (
                # prevent Email::Simple::Creator from running,
                # this header is useless for threading as we use X-PI-TS
                # for sorting and display:
@@ -164,7 +158,7 @@ sub mini_mime {
        if (my $refs = $self->{references}) {
                push @h, References => $refs;
        }
-       my $mime = Email::MIME->create(header_str => \@hs, header => \@h);
+       my $mime = Email::MIME->create(header => \@h);
        my $h = $mime->header_obj;
 
        # set these headers manually since Encode::encode('MIME-Q', ...)
@@ -189,12 +183,7 @@ sub mid ($;$) {
        }
 }
 
-sub _extract_mid {
-       my ($self) = @_;
-
-       my $mid = $self->mime->header('Message-ID');
-       defined $mid ? mid_clean($mid) : $mid;
-}
+sub _extract_mid { mid_clean(mid_mime($_[0]->mime)) }
 
 sub mime {
        my ($self, $mime) = @_;