@ $attr";
if ($nr_c) {
- my $cmid = $children->[0]->{mid};
- $rv .= $pad . $mapping->{$cmid}->[0];
+ my $cmid = $children->[0] ? $children->[0]->{mid} : undef;
+ $rv .= $pad . _skel_hdr($mapping, $cmid);
if ($nr_c > 2) {
my $s = ($nr_c - 1). ' more replies';
$rv .= pad_link($cmid, $level + 1, $s);
} elsif (my $cn = $children->[1]) {
- $rv .= $pad . $mapping->{$cn->{mid}}->[0];
+ $rv .= $pad . _skel_hdr($mapping, $cn->{mid});
}
}
my $next = $siblings->[$idx+1] if $siblings && $idx >= 0;
if ($next) {
my $nmid = $next->{mid};
- $rv .= $pad . $mapping->{$nmid}->[0];
+ $rv .= $pad . _skel_hdr($mapping, $nmid);
my $nnext = $nr_s - $idx;
if ($nnext > 2) {
my $s = ($nnext - 1).' subsequent siblings';
$rv .= pad_link($nmid, $level, $s);
} elsif (my $nn = $siblings->[$idx + 2]) {
- $rv .= $pad . $mapping->{$nn->{mid}}->[0];
+ $rv .= $pad . _skel_hdr($mapping, $nn->{mid});
}
}
$rv .= $pad ."$s_s, $s_c; $ctx->{s_nr}\n";
@@ -370,12 +384,12 @@ 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 next_in_queue ($;$) {
+sub next_in_queue ($$) {
my ($q, $ghost_ok) = @_;
while (@$q) {
my ($level, $smsg) = splice(@$q, 0, 2);
@@ -387,53 +401,71 @@ sub next_in_queue ($;$) {
}
sub stream_thread_i { # PublicInbox::WwwStream::getline callback
- my ($ctx) = @_;
+ my ($ctx, $eml) = @_;
+ return thread_eml_entry($ctx, $eml) if $eml;
return unless exists($ctx->{skel});
- my $nr = $ctx->{nr}++;
- my ($level, $smsg) = next_in_queue($ctx->{-queue}, $nr);
-
- $smsg or return
- join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{skel}};
-
- my $eml = $ctx->{-inbox}->smsg_eml($smsg) or return
- ghost_index_entry($ctx, $level, $smsg);
-
- if ($nr == 0) {
- $ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->html_top . thread_eml_entry($ctx, $level, $smsg, $eml);
- } else {
- thread_eml_entry($ctx, $level, $smsg, $eml);
+ 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;
+ }
}
}
sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
$ctx->{-queue} = [ map { (0, $_) } @$rootset ];
- PublicInbox::WwwStream::response($ctx, 200, \&stream_thread_i);
+ PublicInbox::WwwStream::aresponse($ctx, 200, \&stream_thread_i);
}
-# /$INBOX/$MESSAGE_ID/t/
+# /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
sub thread_html {
my ($ctx) = @_;
+ $ctx->{-upfx} = '../../';
my $mid = $ctx->{mid};
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
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";
$skel .= " / follow: Atom feed)\n";
$skel .= "-- links below jump to the message on this page --\n";
- $ctx->{-upfx} = '../../';
$ctx->{cur_level} = 0;
$ctx->{skel} = \$skel;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
- $ctx->{root_anchor} = anchor_for($mid);
- $ctx->{mapping} = {};
+ $ctx->{root_anchor} = 'm' . id_compress($mid, 1);
+ $ctx->{mapping} = {}; # mid -> [ header_summary, node, idx, level ]
$ctx->{s_nr} = ($nr > 1 ? "$nr+ messages" : 'only message')
.' in thread';
@@ -449,23 +481,26 @@ sub thread_html {
# flat display: lazy load the full message from smsg
$ctx->{msgs} = $msgs;
$ctx->{-html_tip} = '';
- PublicInbox::WwwStream::response($ctx, 200, \&thread_html_i);
+ PublicInbox::WwwStream::aresponse($ctx, 200, \&thread_html_i);
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
- my ($ctx) = @_;
- my $msgs = $ctx->{msgs} or return;
- while (my $smsg = shift @$msgs) {
- my $eml = $ctx->{-inbox}->smsg_eml($smsg) or next;
+ my ($ctx, $eml) = @_;
+ if ($eml) {
+ my $smsg = $ctx->{smsg};
if (exists $ctx->{-html_tip}) {
$ctx->{-title_html} = ascii_html($smsg->{subject});
- return $ctx->html_top .
- eml_entry($ctx, $smsg, $eml, scalar @$msgs);
+ $ctx->zmore($ctx->html_top);
}
- return eml_entry($ctx, $smsg, $eml, scalar @$msgs);
+ 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 {
@@ -499,7 +534,8 @@ sub attach_link ($$$$;$) {
return unless $part->{bdy};
my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
- my $size = bytes::length($part->body);
+ my $size = length($part->body);
+ delete $part->{bdy}; # save memory
# hide attributes normally, unless we want to aid users in
# spotting MUA problems:
@@ -535,7 +571,7 @@ EOF
sub add_text_body { # callback for each_part
my ($p, $ctx) = @_;
my $upfx = $ctx->{mhref};
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
# $p - from each_part: [ Email::MIME-like, depth, $idx ]
my ($part, $depth, $idx) = @$p;
@@ -552,7 +588,7 @@ sub add_text_body { # callback for each_part
# makes no difference to browsers, and don't screw up filename
# link generation in diffs with the extra '%0D'
- $s =~ s/\r\n/\n/sg;
+ $s =~ s/\r+\n/\n/sg;
# will be escaped to `•' in HTML
obfuscate_addrs($ibx, $s, "\x{2022}") if $ibx->{obfuscate};
@@ -572,8 +608,9 @@ sub add_text_body { # callback for each_part
$diff = 1;
delete $ctx->{-long_path};
my $spfx;
- if ($ibx->{-repo_objs}) {
- if (index($upfx, '//') >= 0) { # absolute URL (Atom feeds)
+ # absolute URL (Atom feeds)
+ if ($ibx->{coderepo}) {
+ if (index($upfx, '//') >= 0) {
$spfx = $upfx;
$spfx =~ s!/([^/]*)/\z!/!;
} else {
@@ -590,9 +627,6 @@ sub add_text_body { # callback for each_part
$ctx->{-spfx} = $spfx;
};
- # some editors don't put trailing newlines at the end:
- $s .= "\n" unless $s =~ /\n\z/s;
-
# split off quoted and unquoted blocks:
my @sections = PublicInbox::MsgIter::split_quotes($s);
undef $s; # free memory
@@ -601,6 +635,7 @@ sub add_text_body { # callback for each_part
attach_link($ctx, $ct, $p, $fn, $err);
$$rv .= "\n";
}
+ delete $part->{bdy}; # save memory
foreach my $cur (@sections) {
if ($cur =~ /\A>/) {
# we use a here to allow users to specify
@@ -619,25 +654,28 @@ sub add_text_body { # callback for each_part
}
sub _msg_page_prepare_obuf {
- my ($hdr, $ctx) = @_;
- my $over = $ctx->{-inbox}->over;
+ my ($eml, $ctx) = @_;
+ my $over = $ctx->{ibx}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
- my $mids = mids_for_index($hdr);
+ my $mids = mids_for_index($eml);
my $nr = $ctx->{nr}++;
if ($nr) { # unlikely
+ if ($ctx->{chash} eq content_hash($eml)) {
+ warn "W: BUG? @$mids not deduplicated properly\n";
+ return \$rv;
+ }
+ $rv .=
+"WARNING: multiple messages have this Message-ID\n
";
$rv .= '';
} else {
- $ctx->{first_hdr} = $hdr;
- if ($ctx->{smsg}) {
- $rv .=
-"WARNING: multiple messages have this Message-ID\n
";
- }
+ $ctx->{first_hdr} = $eml->header_obj;
+ $ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID
$rv .= ""; # anchor for body start
}
$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));
@@ -648,14 +686,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;
@@ -671,10 +709,10 @@ 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";
+ $rv .= qq{Date: $v\t[thread overview]\n};
}
if (!$nr) { # first (and only) message, common case
$ctx->{-title_html} = join(' - ', @title);
@@ -690,12 +728,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;
}
@@ -710,7 +748,7 @@ sub SKEL_EXPAND () {
sub thread_skel ($$$) {
my ($skel, $ctx, $hdr) = @_;
my $mid = mids($hdr)->[0];
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
my $parent = in_reply_to($hdr);
$$skel .= "\nThread overview: ";
@@ -719,7 +757,8 @@ sub thread_skel ($$$) {
$$skel .= SKEL_EXPAND."\n ";
$$skel .= ghost_parent('../', $parent) . "\n";
} else {
- $$skel .= '[no followups] '.SKEL_EXPAND."\n";
+ $$skel .= "[no followups] ".
+ SKEL_EXPAND."\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
@@ -778,15 +817,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 $ibx = $ctx->{ibx};
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 = ' ';
@@ -817,6 +863,8 @@ sub html_footer {
$parent = " parent";
}
$rv .= "$next $prev$parent ";
+ } else { # unindexed inboxes w/o over
+ $skel = qq( latest);
}
$rv .= qq(reply);
$rv .= $skel;
@@ -831,11 +879,6 @@ sub linkify_ref_no_over {
"<$html>";
}
-sub anchor_for {
- my ($msgid) = @_;
- 'm' . id_compress($msgid, 1);
-}
-
sub ghost_parent {
my ($upfx, $mid) = @_;
@@ -854,7 +897,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;
}
@@ -937,7 +980,7 @@ sub skel_dump { # walk_thread callback
$$skel .= delete($ctx->{sl_note}) || '';
}
- my $f = ascii_html($smsg->{from_name});
+ my $f = ascii_html(delete $smsg->{from_name});
my $obfs_ibx = $ctx->{-obfs_ibx};
obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
@@ -1032,10 +1075,10 @@ sub _skel_ghost {
}
sub sort_ds {
- [ sort {
+ @{$_[0]} = sort {
(eval { $a->topmost->{ds} } || 0) <=>
(eval { $b->topmost->{ds} } || 0)
- } @{$_[0]} ];
+ } @{$_[0]};
}
# accumulate recent topics if search is supported
@@ -1044,7 +1087,7 @@ sub acc_topic { # walk_thread callback
my ($ctx, $level, $smsg) = @_;
my $mid = $smsg->{mid};
my $has_blob = $smsg->{blob} // do {
- if (my $by_mid = $ctx->{-inbox}->smsg_by_mid($mid)) {
+ if (my $by_mid = $ctx->{ibx}->smsg_by_mid($mid)) {
%$smsg = (%$smsg, %$by_mid);
1;
}
@@ -1088,7 +1131,7 @@ sub dump_topics {
}
my @out;
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
# sort by recency, this allows new posts to "bump" old topics...
@@ -1113,10 +1156,8 @@ sub dump_topics {
$anchor = '#t'; # thread skeleton
}
- my $mbox = qq(mbox.gz);
- my $atom = qq(Atom);
my $s = "$top_subj\n" .
- " $ds UTC $n - $mbox / $atom\n";
+ " $ds UTC $n\n";
for (my $i = 0; $i < scalar(@extra); $i += 2) {
my $level = $extra[$i];
my $subj = $extra[$i + 1]; # already normalized
@@ -1138,32 +1179,22 @@ 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) {
- $next = $next ? "$next " : ' ';
- $prev .= qq! latest!;
+ if ($prev) { # aligned padding for: 'next (older) | '
+ $next = $next ? "$next | " : ' | ';
+ $prev .= qq[ | latest];
}
"
page: $next$prev
";
}
-sub index_nav { # callback for WwwStream::getline
- my ($ctx) = @_;
- return $ctx->html_top if exists $ctx->{-html_tip};
- pagination_footer($ctx, '.')
-}
-
sub paginate_recent ($$) {
my ($ctx, $lim) = @_;
my $t = $ctx->{qp}->{t} || '';
@@ -1176,7 +1207,7 @@ sub paginate_recent ($$) {
$t =~ s/\A([0-9]{8,14})-// and $after = str2ts($1);
$t =~ /\A([0-9]{8,14})\z/ and $before = str2ts($1);
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my $msgs = $ibx->recent($opts, $after, $before);
my $nr = scalar @$msgs;
if ($nr < $lim && defined($after)) {
@@ -1197,22 +1228,26 @@ sub paginate_recent ($$) {
}
if (defined($oldest) && $more) {
my $s = ts2str($oldest);
- $ctx->{next_page} = qq!next!;
+ $ctx->{next_page} = qq[] .
+ 'next (older)';
}
if (defined($newest) && (defined($before) || defined($after))) {
my $s = ts2str($newest);
- $ctx->{prev_page} = qq!prev!;
+ $ctx->{prev_page} = qq[] .
+ 'prev (newer)';
}
$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 {
@@ -1242,7 +1277,7 @@ sub thread_adj_level {
sub ghost_index_entry {
my ($ctx, $level, $node) = @_;
my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . ''. ghost_parent($ctx->{-upfx}, $node->{mid})
+ $beg . ''. ghost_parent($ctx->{-upfx}, $node->{mid} // '?')
. '
' . $end;
}