$ctx->{tip} .
multipart_text_as_html(delete $ctx->{mime}, $upfx,
$ctx) . '</pre><hr>'
- } elsif ($more && @$more) {
+ } elsif ($more) {
++$ctx->{end_nr};
- msg_html_more($ctx, $more, $nr);
+ # fake an EOF if {more} retrieval fails fails;
+ eval { msg_html_more($ctx, $nr) };
} elsif ($nr == $ctx->{end_nr}) {
# fake an EOF if generating the footer fails;
# we want to at least show the message if something
# here crashes:
- eval {
- my $hdr = delete($ctx->{hdr});
- '<pre>' . html_footer($hdr, 1, $ctx) .
- '</pre>' . msg_reply($ctx, $hdr)
- };
+ eval { html_footer($ctx) };
} else {
undef
}
# public functions: (unstable)
sub msg_html {
- my ($ctx, $mime, $more, $smsg) = @_;
+ my ($ctx, $mime, $smsg) = @_;
my $ibx = $ctx->{-inbox};
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
my $hdr = $ctx->{hdr} = $mime->header_obj;
- $ctx->{tip} = _msg_html_prepare($hdr, $ctx, $more, 0);
- $ctx->{more} = $more;
+ $ctx->{tip} = _msg_html_prepare($hdr, $ctx, 0);
$ctx->{end_nr} = 2;
$ctx->{smsg} = $smsg;
$ctx->{mime} = $mime;
my ($ctx) = @_;
my $mid = $ctx->{mid};
my $ibx = $ctx->{-inbox};
- my ($first, $more);
+ my ($first);
my $smsg;
if (my $over = $ibx->over) {
my ($id, $prev);
$first = $ibx->msg_by_smsg($smsg) if $smsg;
if ($first) {
my $next = $over->next_by_mid($mid, \$id, \$prev);
- $more = [ $id, $prev, $next ] if $next;
+ $ctx->{more} = [ $id, $prev, $next ] if $next;
}
return unless $first;
} else {
$first = $ibx->msg_by_mid($mid) or return;
}
- msg_html($ctx, PublicInbox::MIME->new($first), $more, $smsg);
+ msg_html($ctx, PublicInbox::MIME->new($first), $smsg);
}
sub msg_html_more {
- my ($ctx, $more, $nr) = @_;
- my $str = eval {
- my ($id, $prev, $smsg) = @$more;
- my $mid = $ctx->{mid};
- my $ibx = $ctx->{-inbox};
- $smsg = $ibx->smsg_mime($smsg);
- my $next = $ibx->over->next_by_mid($mid, \$id, \$prev);
- @$more = $next ? ($id, $prev, $next) : ();
- if ($smsg) {
- my $upfx = '../' . mid_escape($smsg->mid) . '/';
- my $mime = delete $smsg->{mime};
- _msg_html_prepare($mime->header_obj, $ctx, $more, $nr) .
- multipart_text_as_html($mime, $upfx, $ctx) .
- '</pre><hr>'
- } else {
- '';
- }
- };
- if ($@) {
- warn "Error lookup up additional messages: $@\n";
- $str = '<pre>Error looking up additional messages</pre>';
- }
- $str;
+ my ($ctx, $nr) = @_;
+ my ($id, $prev, $smsg) = @{$ctx->{more}};
+ my $ibx = $ctx->{-inbox};
+ $smsg = $ibx->smsg_mime($smsg);
+ my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
+ $ctx->{more} = $next ? [ $id, $prev, $next ] : undef;
+ return '' unless $smsg;
+ my $upfx = '../' . mid_escape($smsg->mid) . '/';
+ my $mime = delete $smsg->{mime};
+ _msg_html_prepare($mime->header_obj, $ctx, $nr) .
+ multipart_text_as_html($mime, $upfx, $ctx) .
+ '</pre><hr>'
}
# /$INBOX/$MESSAGE_ID/#R
-sub msg_reply {
+sub msg_reply ($$) {
my ($ctx, $hdr) = @_;
my $se_url =
'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
$rv .= $pad ."<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
}
-sub walk_thread {
+# non-recursive thread walker
+sub walk_thread ($$$) {
my ($rootset, $ctx, $cb) = @_;
my @q = map { (0, $_, -1) } @$rootset;
while (@q) {
}
}
-sub pre_thread {
+sub pre_thread { # walk_thread callback
my ($ctx, $level, $node, $idx) = @_;
$ctx->{mapping}->{$node->{id}} = [ '', $node, $idx, $level ];
skel_dump($ctx, $level, $node);
# reduce hash lookups in pre_thread->skel_dump
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- walk_thread($rootset, $ctx, *pre_thread);
+ walk_thread($rootset, $ctx, \&pre_thread);
$skel .= '</pre>';
return stream_thread($rootset, $ctx) unless $ctx->{flat};
}
sub _msg_html_prepare {
- my ($hdr, $ctx, $more, $nr) = @_;
+ my ($hdr, $ctx, $nr) = @_;
my $atom = '';
my $over = $ctx->{-inbox}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
my $mids = mids_for_index($hdr);
if ($nr == 0) {
- if ($more) {
+ if ($ctx->{more}) {
$rv .=
"<pre>WARNING: multiple messages have this Message-ID\n</pre>";
}
$rv .= "\n";
}
-sub thread_skel {
- my ($skel, $ctx, $hdr, $tpfx) = @_;
+sub SKEL_EXPAND () {
+ qq(expand[<a\nhref="T/#u">flat</a>) .
+ qq(|<a\nhref="t/#u">nested</a>] ) .
+ qq(<a\nhref="t.mbox.gz">mbox.gz</a> ) .
+ qq(<a\nhref="t.atom">Atom feed</a>);
+}
+
+sub thread_skel ($$$) {
+ my ($skel, $ctx, $hdr) = @_;
my $mid = mids($hdr)->[0];
my $ibx = $ctx->{-inbox};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
- my $expand = qq(expand[<a\nhref="${tpfx}T/#u">flat</a>) .
- qq(|<a\nhref="${tpfx}t/#u">nested</a>] ) .
- qq(<a\nhref="${tpfx}t.mbox.gz">mbox.gz</a> ) .
- qq(<a\nhref="${tpfx}t.atom">Atom feed</a>);
-
my $parent = in_reply_to($hdr);
$$skel .= "\n<b>Thread overview: </b>";
if ($nr <= 1) {
if (defined $parent) {
- $$skel .= "$expand\n ";
- $$skel .= ghost_parent("$tpfx../", $parent) . "\n";
+ $$skel .= SKEL_EXPAND."\n ";
+ $$skel .= ghost_parent('../', $parent) . "\n";
} else {
- $$skel .= "[no followups] $expand\n";
+ $$skel .= '[no followups] '.SKEL_EXPAND."\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
return;
}
- $$skel .= "$nr+ messages / $expand";
- $$skel .= qq! <a\nhref="#b">top</a>\n!;
+ $$skel .= $nr;
+ $$skel .=
'+ messages / '.SKEL_EXPAND.qq! <a\nhref="#b">top</a>\n!;
# nb: mutt only shows the first Subject in the index pane
# when multiple Subject: headers are present, so we follow suit:
# reduce hash lookups in skel_dump
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- walk_thread(thread_results($ctx, $msgs), $ctx, *skel_dump);
+ walk_thread(thread_results($ctx, $msgs), $ctx, \&skel_dump);
$ctx->{parent_msg} = $parent;
}
$rv;
}
+# returns a string buffer via ->getline
sub html_footer {
- my ($hdr, $standalone, $ctx, $rhref) = @_;
-
- my $ibx = $ctx->{-inbox} if $ctx;
+ my ($ctx) = @_;
+ my $ibx = $ctx->{-inbox};
+ my $hdr = delete $ctx->{hdr};
my $upfx = '../';
- my $tpfx = '';
- my $skel = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
- my $irt = '';
- if ($skel && $ibx->over) {
+ my $skel = " <a\nhref=\"$upfx\">index</a>";
+ my $rv = '<pre>';
+ if ($ibx->over) {
$skel .= "\n";
- thread_skel(\$skel, $ctx, $hdr, $tpfx);
+ thread_skel(\$skel, $ctx, $hdr);
my ($next, $prev);
my $parent = ' ';
$next = $prev = ' ';
} elsif ($u) { # unlikely
$parent = " <a\nhref=\"$u\"\nrel=prev>parent</a>";
}
- $irt = "$next $prev$parent ";
- } else {
- $irt = '';
+ $rv .= "$next $prev$parent ";
}
- $rhref ||= '#R';
- $irt .= qq(<a\nhref="$rhref">reply</a>);
- $irt .= $skel;
+ $rv .= qq(<a\nhref="#R">reply</a>);
+ $rv .= $skel;
+ $rv .= '</pre>';
+ $rv .= msg_reply($ctx, $hdr);
}
sub linkify_ref_no_over {
if (defined($mid) && scalar(@$rootset) > 1) {
$ctx->{root_idx} = -1;
my $nr = scalar @$msgs;
- walk_thread($rootset, $ctx, *find_mid_root);
+ walk_thread($rootset, $ctx, \&find_mid_root);
my $idx = $ctx->{found_mid_at};
if (defined($idx) && $idx != 0) {
my $tip = splice(@$rootset, $idx, 1);
$omit;
}
-sub skel_dump {
+sub skel_dump { # walk_thread callback
my ($ctx, $level, $node) = @_;
my $smsg = $node->{smsg} or return _skel_ghost($ctx, $level, $node);
# accumulate recent topics if search is supported
# returns 200 if done, 404 if not
-sub acc_topic {
+sub acc_topic { # walk_thread callback
my ($ctx, $level, $node) = @_;
my $mid = $node->{id};
my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid);
my ($ctx) = @_;
my $msgs = paginate_recent($ctx, 200); # 200 is our window
if (@$msgs) {
- walk_thread(thread_results($ctx, $msgs), $ctx, *acc_topic);
+ walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
}
- PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav);
+ PublicInbox::WwwStream->response($ctx, dump_topics($ctx), \&index_nav);
}
sub thread_adj_level {