X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=9c3ef104f1a83ab28edfce75cf2ce2308ad3af76;hb=6c853f5256f3a324c018a37a9e8a6b9fc8fdc063;hp=4d6f44e0bdc8dca7b1b9da9fa88bb3349b6e74da;hpb=52a02a813a46940530183ede4d4cc7028290cd8f;p=public-inbox.git
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 4d6f44e0..9c3ef104 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -7,18 +7,19 @@ package PublicInbox::View;
use strict;
use warnings;
use bytes (); # only for bytes::length
+use List::Util qw(max);
use PublicInbox::MsgTime qw(msg_datestamp);
-use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl mid_href);
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl mid_href
+ ts2str fmt_ts);
use PublicInbox::Linkify;
use PublicInbox::MID qw(id_compress mids mids_for_index references
$MID_EXTRACT);
use PublicInbox::MsgIter;
use PublicInbox::Address;
-use PublicInbox::WwwStream;
+use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::Reply;
use PublicInbox::ViewDiff qw(flush_diff);
use PublicInbox::Eml;
-use POSIX qw(strftime);
use Time::Local qw(timegm);
use PublicInbox::Smsg qw(subject_normalized);
use constant COLS => 72;
@@ -27,58 +28,55 @@ use constant TCHILD => '` ';
sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
sub msg_page_i {
- my ($nr, $ctx) = @_;
- if (my $more = delete $ctx->{more}) { # unlikely
- # fake an EOF if $more retrieval fails;
- eval { msg_page_more($ctx, $nr, @$more) };
- } elsif (my $hdr = delete $ctx->{hdr}) {
- # fake an EOF if generating the footer fails;
- # we want to at least show the message if something
- # here crashes:
- eval { html_footer($ctx, $hdr) };
- } else {
- undef
+ my ($ctx, $eml) = @_;
+ if ($eml) { # called by WwwStream::async_eml or getline
+ my $smsg = $ctx->{smsg};
+ $ctx->{smsg} = $ctx->{over}->next_by_mid(@{$ctx->{next_arg}});
+ $ctx->{mhref} = ($ctx->{nr} || $ctx->{smsg}) ?
+ "../${\mid_href($smsg->{mid})}/" : '';
+ my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($eml, $ctx);
+ multipart_text_as_html($eml, $ctx);
+ delete $ctx->{obuf};
+ $$obuf .= '
';
+ $$obuf .= html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg};
+ $$obuf;
+ } else { # called by WwwStream::async_next or getline
+ $ctx->{smsg}; # may be undef
}
}
+# /$INBOX/$MSGID/ for unindexed v1 inboxes
+sub no_over_html ($) {
+ my ($ctx) = @_;
+ my $bref = $ctx->{-inbox}->msg_by_mid($ctx->{mid}) or return; # 404
+ my $eml = PublicInbox::Eml->new($bref);
+ $ctx->{mhref} = '';
+ PublicInbox::WwwStream::init($ctx);
+ my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($eml, $ctx);
+ multipart_text_as_html($eml, $ctx);
+ delete $ctx->{obuf};
+ $$obuf .= '
';
+ eval { $$obuf .= html_footer($ctx, $eml) };
+ html_oneshot($ctx, 200, $obuf);
+}
+
# public functions: (unstable)
sub msg_page {
my ($ctx) = @_;
- my $mid = $ctx->{mid};
my $ibx = $ctx->{-inbox};
- my ($smsg, $first, $next);
- if (my $over = $ibx->over) {
- my ($id, $prev);
- $smsg = $over->next_by_mid($mid, \$id, \$prev) or return;
- $first = $ibx->msg_by_smsg($smsg) or return;
- $next = $over->next_by_mid($mid, \$id, \$prev);
- $ctx->{more} = [ $id, $prev, $next ] if $next;
- } else {
- $first = $ibx->msg_by_mid($mid) or return;
- }
- my $mime = PublicInbox::Eml->new($first);
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- my $hdr = $ctx->{hdr} = $mime->header_obj;
- $ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx, 0);
- $ctx->{smsg} = $smsg;
- # $next cannot be true w/o $smsg being defined:
- $ctx->{mhref} = $next ? '../'.mid_href($smsg->{mid}).'/' : '';
- multipart_text_as_html($mime, $ctx);
- $ctx->{-html_tip} = (${delete $ctx->{obuf}} .= '
');
- PublicInbox::WwwStream::response($ctx, 200, \&msg_page_i);
-}
+ my $over = $ctx->{over} = $ibx->over or return no_over_html($ctx);
+ my ($id, $prev);
+ my $next_arg = $ctx->{next_arg} = [ $ctx->{mid}, \$id, \$prev ];
-sub msg_page_more { # cold
- my ($ctx, $nr, $id, $prev, $smsg) = @_;
- my $ibx = $ctx->{-inbox};
- my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
- $ctx->{more} = [ $id, $prev, $next ] if $next;
- my $eml = $ibx->smsg_eml($smsg) or return '';
- $ctx->{mhref} = '../' . mid_href($smsg->{mid}) . '/';
- $ctx->{obuf} = _msg_page_prepare_obuf($eml->header_obj, $ctx, $nr);
- multipart_text_as_html($eml, $ctx);
- ${delete $ctx->{obuf}} .= '
';
+ my $smsg = $ctx->{smsg} = $over->next_by_mid(@$next_arg) or
+ return; # undef == 404
+
+ # allow user to easily browse the range around this message if
+ # they have ->over
+ $ctx->{-t_max} = $smsg->{ts};
+ PublicInbox::WwwStream::aresponse($ctx, 200, \&msg_page_i);
}
# /$INBOX/$MESSAGE_ID/#R
@@ -177,13 +175,11 @@ sub nr_to_s ($$$) {
$nr == 1 ? "$nr $singular" : "$nr $plural";
}
-# human-friendly format
-sub fmt_ts ($) { strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
-
# Displays the text of of the message for /$INBOX/$MSGID/[Tt]/ endpoint
# this is already inside a
sub eml_entry {
- my ($ctx, $smsg, $eml, $more) = @_;
+ my ($ctx, $eml) = @_;
+ my $smsg = delete $ctx->{smsg};
my $subj = delete $smsg->{subject};
my $mid_raw = $smsg->{mid};
my $id = id_compress($mid_raw, 1);
@@ -205,16 +201,15 @@ sub eml_entry {
# Deleting these fields saves about 400K as we iterate across 1K msgs
delete @$smsg{qw(ts blob)};
- my $hdr = $eml->header_obj;
- my $from = _hdr_names_html($hdr, 'From');
+ my $from = _hdr_names_html($eml, 'From');
obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
$rv .= "From: $from @ ".fmt_ts($ds)." UTC";
my $upfx = $ctx->{-upfx};
my $mhref = $upfx . mid_href($mid_raw) . '/';
$rv .= qq{ (permalink / };
$rv .= qq{raw)\n};
- my $to = fold_addresses(_hdr_names_html($hdr, 'To'));
- my $cc = fold_addresses(_hdr_names_html($hdr, 'Cc'));
+ my $to = fold_addresses(_hdr_names_html($eml, 'To'));
+ my $cc = fold_addresses(_hdr_names_html($eml, 'Cc'));
my ($tlen, $clen) = (length($to), length($cc));
my $to_cc = '';
if (($tlen + $clen) > COLS) {
@@ -233,7 +228,7 @@ sub eml_entry {
$rv .= $to_cc;
my $mapping = $ctx->{mapping};
- if (!$mapping && (defined($irt) || defined($irt = in_reply_to($hdr)))) {
+ if (!$mapping && (defined($irt) || defined($irt = in_reply_to($eml)))) {
my $href = $upfx . mid_href($irt) . '/';
my $html = ascii_html($irt);
$rv .= qq(In-Reply-To: <$html>\n)
@@ -273,7 +268,8 @@ sub eml_entry {
$hr = $ctx->{-hr};
}
- $rv .= $more ? '
' : '
' if $hr;
+ # do we have more messages? start a new if so
+ $rv .= scalar(@{$ctx->{msgs}}) ? '
' : '
' if $hr;
$rv;
}
@@ -372,60 +368,76 @@ sub pre_thread { # walk_thread callback
}
sub thread_eml_entry {
- my ($ctx, $level, $smsg, $eml) = @_;
- my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . '' . eml_entry($ctx, $smsg, $eml, 0) . '
' . $end;
+ my ($ctx, $eml) = @_;
+ my ($beg, $end) = thread_adj_level($ctx, $ctx->{level});
+ $beg . '' . eml_entry($ctx, $eml) . '
' . $end;
}
-sub stream_thread_i { # PublicInbox::WwwStream::getline callback
- my ($nr, $ctx) = @_;
- return unless exists($ctx->{skel});
- my $q = $ctx->{-queue};
+sub next_in_queue ($$) {
+ my ($q, $ghost_ok) = @_;
while (@$q) {
- my $level = shift @$q;
- my $node = shift @$q or next;
+ my ($level, $smsg) = splice(@$q, 0, 2);
my $cl = $level + 1;
- unshift @$q, map { ($cl, $_) } @{$node->{children}};
- if (my $eml = $ctx->{-inbox}->smsg_eml($node)) {
- return thread_eml_entry($ctx, $level, $node, $eml);
- } else {
- return ghost_index_entry($ctx, $level, $node);
+ unshift @$q, map { ($cl, $_) } @{$smsg->{children}};
+ return ($level, $smsg) if $ghost_ok || exists($smsg->{blob});
+ }
+ undef;
+}
+
+sub stream_thread_i { # PublicInbox::WwwStream::getline callback
+ my ($ctx, $eml) = @_;
+ goto &thread_eml_entry if $eml; # tail recursion
+ return unless exists($ctx->{skel});
+ my $ghost_ok = $ctx->{nr}++;
+ while (1) {
+ my ($lvl, $smsg) = next_in_queue($ctx->{-queue}, $ghost_ok);
+ if ($smsg) {
+ if (exists $smsg->{blob}) { # next message for cat-file
+ $ctx->{level} = $lvl;
+ if (!$ghost_ok) { # first non-ghost
+ $ctx->{-title_html} =
+ ascii_html($smsg->{subject});
+ $ctx->zmore($ctx->html_top);
+ }
+ return $smsg;
+ }
+ # buffer the ghost entry and loop
+ $ctx->zmore(ghost_index_entry($ctx, $lvl, $smsg));
+ } else { # all done
+ $ctx->zmore(join('', thread_adj_level($ctx, 0)));
+ $ctx->zmore(${delete($ctx->{skel})});
+ return;
}
}
- join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{skel}};
}
sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
- my $ibx = $ctx->{-inbox};
- my @q = map { (0, $_) } @$rootset;
- my ($smsg, $eml, $level);
- while (@q) {
- $level = shift @q;
- $smsg = shift @q or next;
- my $cl = $level + 1;
- unshift @q, map { ($cl, $_) } @{$smsg->{children}};
- $eml = $ibx->smsg_eml($smsg) and last;
- }
- return missing_thread($ctx) unless $eml;
-
- $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- $ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->{-html_tip} = thread_eml_entry($ctx, $level, $smsg, $eml);
- $ctx->{-queue} = \@q;
- PublicInbox::WwwStream::response($ctx, 200, \&stream_thread_i);
+ $ctx->{-queue} = [ map { (0, $_) } @$rootset ];
+ PublicInbox::WwwStream::aresponse($ctx, 200, \&stream_thread_i);
}
-# /$INBOX/$MESSAGE_ID/t/
+# /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
sub thread_html {
my ($ctx) = @_;
my $mid = $ctx->{mid};
my $ibx = $ctx->{-inbox};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
return missing_thread($ctx) if $nr == 0;
+
+ # link $INBOX_DIR/description text to "index_topics" view around
+ # the newest message in this thread
+ my $t = ts2str($ctx->{-t_max} = max(map { delete $_->{ts} } @$msgs));
+ my $t_fmt = fmt_ts($ctx->{-t_max});
+
my $skel = '
';
$skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
- $skel .= ", back to index\n\n";
+ $skel .= <~$t_fmt UTC | newest]
+
+EOF
$skel .= "Thread overview: ";
$skel .= $nr == 1 ? '(only message)' : "$nr+ messages";
$skel .= " (download: mbox.gz";
@@ -451,26 +463,28 @@ sub thread_html {
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
- my ($smsg, $eml);
- while ($smsg = shift @$msgs) {
- $eml = $ibx->smsg_eml($smsg) and last;
- }
- return missing_thread($ctx) unless $smsg;
- $ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->{-html_tip} = ''.eml_entry($ctx, $smsg, $eml, scalar @$msgs);
$ctx->{msgs} = $msgs;
- PublicInbox::WwwStream::response($ctx, 200, \&thread_html_i);
+ $ctx->{-html_tip} = '';
+ PublicInbox::WwwStream::aresponse($ctx, 200, \&thread_html_i);
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
- my ($nr, $ctx) = @_;
- my $msgs = $ctx->{msgs} or return;
- while (my $smsg = shift @$msgs) {
- my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
- return eml_entry($ctx, $smsg, $eml, scalar @$msgs);
+ my ($ctx, $eml) = @_;
+ if ($eml) {
+ my $smsg = $ctx->{smsg};
+ if (exists $ctx->{-html_tip}) {
+ $ctx->{-title_html} = ascii_html($smsg->{subject});
+ $ctx->zmore($ctx->html_top);
+ }
+ return eml_entry($ctx, $eml);
+ } else {
+ while (my $smsg = shift @{$ctx->{msgs}}) {
+ return $smsg if exists($smsg->{blob});
+ }
+ my $skel = delete($ctx->{skel}) or return; # all done
+ $ctx->zmore($$skel);
+ undef;
}
- my ($skel) = delete @$ctx{qw(skel msgs)};
- $$skel;
}
sub multipart_text_as_html {
@@ -624,25 +638,25 @@ sub add_text_body { # callback for each_part
}
sub _msg_page_prepare_obuf {
- my ($hdr, $ctx, $nr) = @_;
+ my ($eml, $ctx) = @_;
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
- my $mids = mids_for_index($hdr);
- if ($nr == 0) {
- if ($ctx->{more}) {
+ my $mids = mids_for_index($eml);
+ my $nr = $ctx->{nr}++;
+ if ($nr) { # unlikely
+ $rv .= '';
+ } else {
+ $ctx->{first_hdr} = $eml->header_obj;
+ if ($ctx->{smsg}) {
$rv .=
"WARNING: multiple messages have this Message-ID\n
";
}
$rv .= ""; # anchor for body start
- } else {
- $rv .= '';
- }
- if ($over) {
- $ctx->{-upfx} = '../';
}
+ $ctx->{-upfx} = '../' if $over;
my @title; # (Subject[0], From[0])
- for my $v ($hdr->header('From')) {
+ for my $v ($eml->header('From')) {
my @n = PublicInbox::Address::names($v);
$v = ascii_html($v);
$title[1] //= ascii_html(join(', ', @n));
@@ -653,14 +667,14 @@ sub _msg_page_prepare_obuf {
$rv .= "From: $v\n" if $v ne '';
}
foreach my $h (qw(To Cc)) {
- for my $v ($hdr->header($h)) {
+ for my $v ($eml->header($h)) {
fold_addresses($v);
$v = ascii_html($v);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
$rv .= "$h: $v\n" if $v ne '';
}
}
- my @subj = $hdr->header('Subject');
+ my @subj = $eml->header('Subject');
if (@subj) {
my $v = ascii_html(shift @subj);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
@@ -676,12 +690,15 @@ sub _msg_page_prepare_obuf {
$rv .= qq() if $over;
$title[0] = '(no subject)';
}
- for my $v ($hdr->header('Date')) {
+ for my $v ($eml->header('Date')) {
$v = ascii_html($v);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
$rv .= "Date: $v\n";
}
- $ctx->{-title_html} = join(' - ', @title);
+ if (!$nr) { # first (and only) message, common case
+ $ctx->{-title_html} = join(' - ', @title);
+ $rv = $ctx->html_top . $rv;
+ }
if (scalar(@$mids) == 1) { # common case
my $mhtml = ascii_html($mids->[0]);
$rv .= "Message-ID: <$mhtml> ";
@@ -692,12 +709,12 @@ sub _msg_page_prepare_obuf {
my $lnk = PublicInbox::Linkify->new;
my $s = '';
for my $h (qw(Message-ID X-Alt-Message-ID)) {
- $s .= "$h: $_\n" for ($hdr->header_raw($h));
+ $s .= "$h: $_\n" for ($eml->header_raw($h));
}
$lnk->linkify_mids('..', \$s, 1);
$rv .= $s;
}
- $rv .= _parent_headers($hdr, $over);
+ $rv .= _parent_headers($eml, $over);
$rv .= "\n";
\$rv;
}
@@ -780,15 +797,22 @@ sub _parent_headers {
$rv;
}
-# returns a string buffer via ->getline
+# returns a string buffer
sub html_footer {
my ($ctx, $hdr) = @_;
my $ibx = $ctx->{-inbox};
my $upfx = '../';
- my $skel = " index";
+ my $skel;
my $rv = '';
if ($ibx->over) {
- $skel .= "\n";
+ my $t = ts2str($ctx->{-t_max});
+ my $t_fmt = fmt_ts($ctx->{-t_max});
+ $skel .= <~$t_fmt UTC|newest]
+EOF
+
thread_skel(\$skel, $ctx, $hdr);
my ($next, $prev);
my $parent = ' ';
@@ -819,6 +843,8 @@ sub html_footer {
$parent = " parent";
}
$rv .= "$next $prev$parent ";
+ } else { # unindexed inboxes w/o over
+ $skel = qq( latest);
}
$rv .= qq(reply);
$rv .= $skel;
@@ -856,7 +882,7 @@ sub find_mid_root {
++$ctx->{root_idx} if $level == 0;
if ($node->{mid} eq $ctx->{mid}) {
$ctx->{found_mid_at} = $ctx->{root_idx};
- return 0;
+ return 0; # stop iterating
}
1;
}
@@ -1140,17 +1166,13 @@ sub dump_topics {
200;
}
-# only for the t= query parameter passed to overview DB
-sub ts2str ($) { strftime('%Y%m%d%H%M%S', gmtime($_[0])) };
-
sub str2ts ($) {
my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $_[0]);
- timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy);
+ timegm($ss || 0, $mm || 0, $hh || 0, $dd, $mon - 1, $yyyy);
}
sub pagination_footer ($$) {
my ($ctx, $latest) = @_;
- delete $ctx->{qp} or return;
my $next = $ctx->{next_page} || '';
my $prev = $ctx->{prev_page} || '';
if ($prev) {
@@ -1160,11 +1182,6 @@ sub pagination_footer ($$) {
"
page: $next$prev
";
}
-sub index_nav { # callback for WwwStream
- my (undef, $ctx) = @_;
- pagination_footer($ctx, '.')
-}
-
sub paginate_recent ($$) {
my ($ctx, $lim) = @_;
my $t = $ctx->{qp}->{t} || '';
@@ -1207,13 +1224,15 @@ sub paginate_recent ($$) {
$msgs;
}
+# GET /$INBOX - top-level inbox view for indexed inboxes
sub index_topics {
my ($ctx) = @_;
my $msgs = paginate_recent($ctx, 200); # 200 is our window
if (@$msgs) {
walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
}
- PublicInbox::WwwStream::response($ctx, dump_topics($ctx), \&index_nav);
+ html_oneshot($ctx, dump_topics($ctx), \pagination_footer($ctx, '.'));
+
}
sub thread_adj_level {