X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FSearchMsg.pm;h=adadf92ed097e8a1b23d11068faa8cebf0237783;hb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;hp=03df7ab4fb40dfe36e58ca58f676631a500294e9;hpb=0108acad0a48e88e189d8627f9c46f9290df4907;p=public-inbox.git
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 03df7ab4..adadf92e 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -1,70 +1,145 @@
-# Copyright (C) 2015, all contributors
-# License: GPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2019 all contributors
+# License: AGPL-3.0+
# based on notmuch, but with no concept of folders, files or flags
+#
+# Wraps a document inside our Xapian search index.
+# There may be many of these objects loaded in memory at once
+# for large threads in our WWW UI.
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 mid_compressed/;
-use Encode qw/find_encoding/;
-my $enc_utf8 = find_encoding('UTF-8');
-our $PFX2TERM_RE = undef;
+use base qw(Exporter);
+our @EXPORT_OK = qw(subject_normalized);
+use PublicInbox::MID qw/mid_clean mid_mime/;
+use PublicInbox::Address;
+use PublicInbox::MsgTime qw(msg_timestamp msg_datestamp);
+use Time::Local qw(timegm);
sub new {
my ($class, $mime) = @_;
- my $doc = Search::Xapian::Document->new;
- $doc->add_term(PublicInbox::Search::xpfx('type') . 'mail');
-
- bless { type => 'mail', doc => $doc, mime => $mime }, $class;
+ bless { mime => $mime }, $class;
}
sub wrap {
- my ($class, $doc, $mid) = @_;
- bless { doc => $doc, mime => undef, mid => $mid }, $class;
+ my ($class, $mid) = @_;
+ bless { mid => $mid }, $class;
+}
+
+sub get_val ($$) {
+ my ($doc, $col) = @_;
+ Search::Xapian::sortable_unserialise($doc->get_value($col));
+}
+
+sub to_doc_data {
+ my ($self, $oid, $mid0) = @_;
+ $oid = '' unless defined $oid;
+ join("\n",
+ $self->subject,
+ $self->from,
+ $self->references,
+ $self->to,
+ $self->cc,
+ $oid,
+ $mid0,
+ $self->{bytes} || '',
+ $self->{lines} || ''
+ );
+}
+
+sub load_from_data ($$) {
+ my ($self) = $_[0]; # data = $_[1]
+ (
+ $self->{subject},
+ $self->{from},
+ $self->{references},
+
+ # To: and Cc: are stored to optimize HDR/XHDR in NNTP since
+ # some NNTP clients will use that for message displays.
+ # NNTP only, and only stored in Over(view), not Xapian
+ $self->{to},
+ $self->{cc},
+
+ $self->{blob},
+ $self->{mid},
+
+ # NNTP only
+ $self->{bytes},
+ $self->{lines}
+ ) = split(/\n/, $_[1]);
+}
+
+sub load_expand {
+ my ($self, $doc) = @_;
+ my $data = $doc->get_data or return;
+ $self->{ts} = get_val($doc, PublicInbox::Search::TS());
+ my $dt = get_val($doc, PublicInbox::Search::DT());
+ my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $dt);
+ $self->{ds} = timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy);
+ utf8::decode($data);
+ load_from_data($self, $data);
+ $self;
+}
+
+sub psgi_cull ($) {
+ my ($self) = @_;
+ from_name($self); # fill in {from_name} so we can delete {from}
+
+ # drop NNTP-only fields which aren't relevant to PSGI results:
+ # saves ~80K on a 200 item search result:
+ delete @$self{qw(from ts to cc bytes lines)};
+ $self;
}
+# Only called by PSGI interface, not NNTP
sub load_doc {
my ($class, $doc) = @_;
- my $data = $doc->get_data;
- $data = $enc_utf8->decode($data);
- my ($mid, $subj, $from, $date, $refs) = split(/\n/, $data);
- bless {
- doc => $doc,
- mid => $mid,
- subject => $subj,
- date => $date,
- from_name => $from,
- references_sorted => $refs,
- }, $class;
-}
-
-sub subject {
+ my $self = bless {}, $class;
+ psgi_cull(load_expand($self, $doc));
+}
+
+# :bytes and :lines metadata in RFC 3977
+sub bytes ($) { $_[0]->{bytes} }
+sub lines ($) { $_[0]->{lines} }
+
+sub __hdr ($$) {
+ my ($self, $field) = @_;
+ my $val = $self->{$field};
+ return $val if defined $val;
+
+ my $mime = $self->{mime} or return;
+ $val = $mime->header($field);
+ $val = '' unless defined $val;
+ $val =~ tr/\t\n/ /;
+ $val =~ tr/\r//d;
+ $self->{$field} = $val;
+}
+
+sub subject ($) { __hdr($_[0], 'subject') }
+sub to ($) { __hdr($_[0], 'to') }
+sub cc ($) { __hdr($_[0], 'cc') }
+
+# no strftime, that is locale-dependent and not for RFC822
+my @DoW = qw(Sun Mon Tue Wed Thu Fri Sat);
+my @MoY = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
+
+sub date ($) {
my ($self) = @_;
- my $subj = $self->{subject};
- return $subj if defined $subj;
- $subj = $self->{mime}->header('Subject');
- $subj = '' unless defined $subj;
- $subj =~ tr/\n/ /;
- $self->{subject} = $subj;
+ my $ds = $self->{ds};
+ return unless defined $ds;
+ my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($ds);
+ "$DoW[$wday], " . sprintf("%02d $MoY[$mon] %04d %02d:%02d:%02d +0000",
+ $mday, $year+1900, $hour, $min, $sec);
+
}
-sub from {
+sub from ($) {
my ($self) = @_;
- my $from = $self->mime->header('From') || '';
- my @from;
-
- if ($from) {
- $from =~ tr/\n/ /;
- @from = Email::Address->parse($from);
- $self->{from} = $from[0];
- $from = $from[0]->name;
+ my $from = __hdr($self, 'from');
+ if (defined $from && !defined $self->{from_name}) {
+ my @n = PublicInbox::Address::names($from);
+ $self->{from_name} = join(', ', @n);
}
- $self->{from_name} = $from;
- $self->{from};
+ $from;
}
sub from_name {
@@ -77,128 +152,45 @@ 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;
+ $self->{ts} ||= eval { msg_timestamp($self->{mime}->header_obj) } || 0;
}
-sub date {
+sub ds {
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->{ds} ||= eval { msg_datestamp($self->{mime}->header_obj); } || 0;
}
-sub to_doc_data {
+sub references {
my ($self) = @_;
-
- $self->mid . "\n" .
- $self->subject . "\n" .
- $self->from_name . "\n".
- $self->date . "\n" .
- $self->references_sorted;
-}
-
-sub references_sorted {
- my ($self) = @_;
- my $x = $self->{references_sorted};
+ my $x = $self->{references};
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) {
- my $or = join('|', keys %PublicInbox::Search::PFX2TERM_RMAP);
- $PFX2TERM_RE = qr/\A($or)/;
- }
-
- for (; $i != $end; $i->inc) {
- my $val = $i->get_termname;
-
- if ($val =~ s/$PFX2TERM_RE//o) {
- my $field = $PublicInbox::Search::PFX2TERM_RMAP{$1};
- $self->{$field} = $val;
- }
- }
-}
-
-# for threading only
-sub mini_mime {
- my ($self) = @_;
- $self->ensure_metadata;
- my @h = (
- Subject => $self->subject,
- 'X-PI-From' => $self->from_name,
- 'X-PI-Date' => $self->date,
- 'X-PI-TS' => $self->ts,
- 'Message-ID' => "<$self->{mid}>",
- );
-
- my $refs = $self->{references_sorted};
- my $mime = Email::MIME->create(header_str => \@h);
- $mime->header_set('References', $refs) if (defined $refs);
- $mime;
-}
-
-sub mid {
+sub mid ($;$) {
my ($self, $mid) = @_;
if (defined $mid) {
$self->{mid} = $mid;
+ } elsif (defined(my $rv = $self->{mid})) {
+ $rv;
} else {
- $self->ensure_metadata; # needed for ghosts
- $self->{mid} ||= $self->_extract_mid;
+ die "NO {mime} for mid\n" unless $self->{mime};
+ $self->_extract_mid; # v1 w/o Xapian
}
}
-sub _extract_mid {
- my ($self) = @_;
-
- my $mid = $self->mime->header('Message-ID');
- $mid ? mid_compressed(mid_clean($mid)) : $mid;
-}
-
-sub mime {
- my ($self, $mime) = @_;
- if (defined $mime) {
- $self->{mime} = $mime;
- } else {
- # TODO load from git
- $self->{mime};
- }
-}
+sub _extract_mid { mid_clean(mid_mime($_[0]->{mime})) }
-sub doc_id {
- my ($self, $doc_id) = @_;
- if (defined $doc_id) {
- $self->{doc_id} = $doc_id;
- } else {
- # TODO load from xapian
- $self->{doc_id};
- }
-}
+our $REPLY_RE = qr/^re:\s+/i;
-sub thread_id {
- my ($self) = @_;
- my $tid = $self->{thread};
- return $tid if defined $tid;
- $self->ensure_metadata;
- $self->{thread};
-}
-
-sub path {
- my ($self) = @_;
- my $path = $self->{path};
- return $path if defined $path;
- $self->ensure_metadata;
- $self->{path};
+sub subject_normalized ($) {
+ my ($subj) = @_;
+ $subj =~ s/\A\s+//s; # no leading space
+ $subj =~ s/\s+\z//s; # no trailing space
+ $subj =~ s/\s+/ /gs; # no redundant spaces
+ $subj =~ s/\.+\z//; # no trailing '.'
+ $subj =~ s/$REPLY_RE//igo; # remove reply prefix
+ $subj;
}
1;