X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=60fc1df17f9e5e242d55a7f05a00ca2e7943c07e;hb=dfef0d2c34fbf21d665c40b5ad5069e9113c35c8;hp=34ab3e58384e3640d2809bfd5c3fe52429037b7e;hpb=007cb8774e7013e2aaca32003bbd1653e3d8582f;p=public-inbox.git
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 34ab3e58..60fc1df1 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -9,7 +9,7 @@ use warnings;
use PublicInbox::MsgTime qw(msg_datestamp);
use PublicInbox::Hval qw/ascii_html obfuscate_addrs/;
use PublicInbox::Linkify;
-use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape mids/;
+use PublicInbox::MID qw/id_compress mid_escape mids references/;
use PublicInbox::MsgIter;
use PublicInbox::Address;
use PublicInbox::WwwStream;
@@ -23,7 +23,7 @@ sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
# public functions: (unstable)
sub msg_html {
- my ($ctx, $mime, $more) = @_;
+ my ($ctx, $mime, $more, $smsg) = @_;
my $hdr = $mime->header_obj;
my $ibx = $ctx->{-inbox};
my $obfs_ibx = $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
@@ -32,7 +32,9 @@ sub msg_html {
PublicInbox::WwwStream->response($ctx, 200, sub {
my ($nr, undef) = @_;
if ($nr == 1) {
- $tip . multipart_text_as_html($mime, '', $obfs_ibx) .
+ # $more cannot be true w/o $smsg being defined:
+ my $upfx = $more ? '../'.mid_escape($smsg->mid).'/' : '';
+ $tip . multipart_text_as_html($mime, $upfx, $obfs_ibx) .
'
'
} elsif ($more && @$more) {
++$end;
@@ -56,45 +58,46 @@ sub msg_page {
my $mid = $ctx->{mid};
my $ibx = $ctx->{-inbox};
my ($first, $more, $head, $tail, $db);
+ my $smsg;
if (my $srch = $ibx->search) {
$srch->retry_reopen(sub {
($head, $tail, $db) = $srch->each_smsg_by_mid($mid);
for (; !defined($first) && $head != $tail; $head++) {
my @args = ($head, $db, $mid);
- my $smsg = PublicInbox::SearchMsg->get(@args);
- next if $smsg->type ne 'mail';
+ $smsg = PublicInbox::SearchMsg->get(@args);
$first = $ibx->msg_by_smsg($smsg);
}
if ($head != $tail) {
$more = [ $head, $tail, $db ];
}
});
+ return unless $first;
} else {
$first = $ibx->msg_by_mid($mid) or return;
}
- $first ? msg_html($ctx, PublicInbox::MIME->new($first), $more) : undef;
+ msg_html($ctx, PublicInbox::MIME->new($first), $more, $smsg);
}
sub msg_html_more {
my ($ctx, $more, $nr) = @_;
my $str = eval {
- my $mref;
+ my $smsg;
my ($head, $tail, $db) = @$more;
- for (; !defined($mref) && $head != $tail; $head++) {
- my $smsg = PublicInbox::SearchMsg->get($head, $db,
- $ctx->{mid});
- next if $smsg->type ne 'mail';
- $mref = $ctx->{-inbox}->msg_by_smsg($smsg);
+ my $mid = $ctx->{mid};
+ for (; !defined($smsg) && $head != $tail; $head++) {
+ my $m = PublicInbox::SearchMsg->get($head, $db, $mid);
+ $smsg = $ctx->{-inbox}->smsg_mime($m);
}
if ($head == $tail) { # done
@$more = ();
} else {
$more->[0] = $head;
}
- if ($mref) {
- my $mime = PublicInbox::MIME->new($mref);
+ if ($smsg) {
+ my $mime = $smsg->{mime};
+ my $upfx = '../' . mid_escape($smsg->mid) . '/';
_msg_html_prepare($mime->header_obj, $ctx, $more, $nr) .
- multipart_text_as_html($mime, '',
+ multipart_text_as_html($mime, $upfx,
$ctx->{-obfs_ibx}) .
'
'
} else {
@@ -167,14 +170,8 @@ EOF
sub in_reply_to {
my ($hdr) = @_;
- my %mid = map { $_ => 1 } $hdr->header_raw('Message-ID');
- my @refs = (($hdr->header_raw('References') || '') =~ /<([^>]+)>/g);
- push(@refs, (($hdr->header_raw('In-Reply-To') || '') =~ /<([^>]+)>/g));
- while (defined(my $irt = pop @refs)) {
- next if $mid{"<$irt>"};
- return $irt;
- }
- undef;
+ my $refs = references($hdr);
+ $refs->[-1];
}
sub _hdr_names_html ($$) {
@@ -191,12 +188,10 @@ sub nr_to_s ($$$) {
# this is already inside a
sub index_entry {
- my ($mime, $ctx, $more) = @_;
+ my ($smsg, $ctx, $more) = @_;
my $srch = $ctx->{srch};
- my $hdr = $mime->header_obj;
- my $subj = $hdr->header('Subject');
-
- my $mid_raw = mid_clean(mid_mime($mime));
+ my $subj = $smsg->subject;
+ my $mid_raw = $smsg->mid;
my $id = id_compress($mid_raw, 1);
my $id_m = 'm'.$id;
@@ -211,6 +206,8 @@ sub index_entry {
$rv .= $subj . "\n";
$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
my @tocc;
+ my $mime = $smsg->{mime};
+ my $hdr = $mime->header_obj;
foreach my $f (qw(To Cc)) {
my $dst = _hdr_names_html($hdr, $f);
if ($dst ne '') {
@@ -220,7 +217,7 @@ sub index_entry {
}
my $from = _hdr_names_html($hdr, 'From');
obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
- $rv .= "From: $from @ "._msg_date($hdr)." UTC";
+ $rv .= "From: $from @ ".fmt_ts($smsg->ds)." UTC";
my $upfx = $ctx->{-upfx};
my $mhref = $upfx . mid_escape($mid_raw) . '/';
$rv .= qq{ (permalink / };
@@ -363,30 +360,30 @@ sub pre_thread {
}
sub thread_index_entry {
- my ($ctx, $level, $mime) = @_;
+ my ($ctx, $level, $smsg) = @_;
my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . '' . index_entry($mime, $ctx, 0) . '
' . $end;
+ $beg . '' . index_entry($smsg, $ctx, 0) . '
' . $end;
}
sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
my $inbox = $ctx->{-inbox};
- my $mime;
my @q = map { (0, $_) } @$rootset;
my $level;
+ my $smsg;
while (@q) {
$level = shift @q;
my $node = shift @q or next;
my $cl = $level + 1;
unshift @q, map { ($cl, $_) } @{$node->{children}};
- $mime = $inbox->msg_by_smsg($node->{smsg}) and last;
+ $smsg = $inbox->smsg_mime($node->{smsg}) and last;
}
- return missing_thread($ctx) unless $mime;
+ return missing_thread($ctx) unless $smsg;
$ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
- $mime = PublicInbox::MIME->new($mime);
- $ctx->{-title_html} = ascii_html($mime->header('Subject'));
- $ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime);
+ $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg);
+ $smsg = undef;
PublicInbox::WwwStream->response($ctx, 200, sub {
return unless $ctx;
while (@q) {
@@ -394,10 +391,8 @@ sub stream_thread ($$) {
my $node = shift @q or next;
my $cl = $level + 1;
unshift @q, map { ($cl, $_) } @{$node->{children}};
- my $mid = $node->{id};
- if ($mime = $inbox->msg_by_smsg($node->{smsg})) {
- $mime = PublicInbox::MIME->new($mime);
- return thread_index_entry($ctx, $level, $mime);
+ if ($smsg = $inbox->smsg_mime($node->{smsg})) {
+ return thread_index_entry($ctx, $level, $smsg);
} else {
return ghost_index_entry($ctx, $level, $node);
}
@@ -434,7 +429,7 @@ sub thread_html {
$ctx->{mapping} = {};
$ctx->{s_nr} = "$nr+ messages in thread";
- my $rootset = thread_results($msgs, $srch);
+ my $rootset = thread_results($ctx, $msgs);
# reduce hash lookups in pre_thread->skel_dump
my $inbox = $ctx->{-inbox};
@@ -445,24 +440,21 @@ sub thread_html {
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
- my $mime;
- while ($mime = shift @$msgs) {
- $mime = $inbox->msg_by_smsg($mime) and last;
+ my $smsg;
+ while (my $m = shift @$msgs) {
+ $smsg = $inbox->smsg_mime($m) and last;
}
- return missing_thread($ctx) unless $mime;
- $mime = PublicInbox::MIME->new($mime);
- $ctx->{-title_html} = ascii_html($mime->header('Subject'));
- $ctx->{-html_tip} = ''.index_entry($mime, $ctx, scalar @$msgs);
- $mime = undef;
+ return missing_thread($ctx) unless $smsg;
+ $ctx->{-title_html} = ascii_html($smsg->subject);
+ $ctx->{-html_tip} = ''.index_entry($smsg, $ctx, scalar @$msgs);
+ $smsg = undef;
PublicInbox::WwwStream->response($ctx, 200, sub {
return unless $msgs;
- while ($mime = shift @$msgs) {
- $mime = $inbox->msg_by_smsg($mime) and last;
- }
- if ($mime) {
- $mime = PublicInbox::MIME->new($mime);
- return index_entry($mime, $ctx, scalar @$msgs);
+ $smsg = undef;
+ while (my $m = shift @$msgs) {
+ $smsg = $inbox->smsg_mime($m) and last;
}
+ return index_entry($smsg, $ctx, scalar @$msgs) if $smsg;
$msgs = undef;
$skel;
});
@@ -656,7 +648,7 @@ sub _msg_html_prepare {
sub thread_skel {
my ($dst, $ctx, $hdr, $tpfx) = @_;
my $srch = $ctx->{srch};
- my $mid = mid_clean($hdr->header_raw('Message-ID'));
+ my $mid = mids($hdr)->[0];
my $sres = $srch->get_thread($mid);
my $nr = $sres->{total};
my $expand = qq(expand[flat) .
@@ -693,7 +685,7 @@ sub thread_skel {
# reduce hash lookups in skel_dump
my $ibx = $ctx->{-inbox};
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- walk_thread(thread_results($sres, $srch), $ctx, *skel_dump);
+ walk_thread(thread_results($ctx, $sres), $ctx, *skel_dump);
$ctx->{parent_msg} = $parent;
}
@@ -816,9 +808,9 @@ sub load_results {
}
sub thread_results {
- my ($msgs, $srch) = @_;
+ my ($ctx, $msgs) = @_;
require PublicInbox::SearchThread;
- PublicInbox::SearchThread::thread($msgs, *sort_ds, $srch);
+ PublicInbox::SearchThread::thread($msgs, *sort_ds, $ctx->{-inbox});
}
sub missing_thread {
@@ -959,7 +951,7 @@ sub acc_topic {
my ($ctx, $level, $node) = @_;
my $srch = $ctx->{srch};
my $mid = $node->{id};
- my $x = $node->{smsg} || $srch->lookup_mail($mid);
+ my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid);
my ($subj, $ds);
my $topic;
if ($x) {
@@ -1077,17 +1069,31 @@ sub index_nav { # callback for WwwStream
sub index_topics {
my ($ctx) = @_;
my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/);
- my $opts = { offset => $off, limit => 200 };
+ my $lim = 200;
+ my $opts = { offset => $off, limit => $lim };
$ctx->{order} = [];
my $srch = $ctx->{srch};
- my $sres = $srch->query('', $opts);
+
+ my $qs = '';
+ # this complicated bit cuts loading time by over 400ms on my system:
+ if ($off == 0) {
+ my ($min, $max) = $ctx->{-inbox}->mm->minmax;
+ my $n = $max - $lim;
+ $n = $min if $n < $min;
+ for (; $qs eq '' && $n >= $min; --$n) {
+ my $smsg = $srch->lookup_article($n) or next;
+ $qs = POSIX::strftime('d:%Y%m%d..', gmtime($smsg->ts));
+ }
+ }
+
+ my $sres = $srch->query($qs, $opts);
my $nr = scalar @{$sres->{msgs}};
if ($nr) {
$sres = load_results($srch, $sres);
- walk_thread(thread_results($sres, $srch), $ctx, *acc_topic);
+ walk_thread(thread_results($ctx, $sres), $ctx, *acc_topic);
}
- $ctx->{-next_o} = $off+ $nr;
+ $ctx->{-next_o} = $off + $nr;
$ctx->{-cur_o} = $off;
PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav);
}