# public functions:
sub msg_html {
my ($ctx, $mime, $full_pfx, $footer) = @_;
- if (defined $footer) {
- $footer = "\n" . $footer;
- } else {
- $footer = '';
- }
+ $footer = defined($footer) ? "\n$footer" : '';
my $hdr = $mime->header_obj;
headers_to_html_header($hdr, $full_pfx, $ctx) .
multipart_text_as_html($mime, $full_pfx) .
# this is already inside a <pre>
sub index_entry {
- my ($fh, $mime, $level, $state) = @_;
+ my ($mime, $level, $state) = @_;
my $midx = $state->{anchor_idx}++;
my $ctx = $state->{ctx};
my $srch = $ctx->{srch};
- my ($prev, $next) = ($midx - 1, $midx + 1);
my $part_nr = 0;
my $hdr = $mime->header_obj;
my $enc = enc_for($hdr->header("Content-Type"));
$from = ascii_html($from);
$subj = ascii_html($subj);
- if ($srch) {
- my $t = $ctx->{flat} ? 'T' : 't';
- $subj = "<a\nhref=\"${path}$href/$t/#u\">$subj</a>";
- }
- if ($root_anchor eq $id) {
- $subj = "<u\nid=u>$subj</u>";
- }
+ $subj = "<a\nhref=\"${path}$href/\">$subj</a>";
+ $subj = "<u\nid=u>$subj</u>" if $root_anchor eq $id;
my $ts = _msg_date($hdr);
my $rv = "<pre\nid=s$midx>";
$rv .= "<b\nid=$id>$subj</b>\n";
- $rv .= "- $from @ $ts UTC - ";
- $rv .= "<a\nhref=\"#s$next\">next</a>";
- if ($prev >= 0) {
- $rv .= "/<a\nhref=\"#s$prev\">prev</a>";
- }
- $fh->write($rv .= "\n\n");
+ my $txt = "${path}$href/raw";
+ my $fh = $state->{fh};
+ $fh->write($rv .= "- $from @ $ts UTC (<a\nhref=\"$txt\">raw</a>)\n\n");
- my ($fhref, $more_ref);
+ my $fhref;
my $mhref = "${path}$href/";
- my $more = 'permalink';
# show full message if it's our root message
my $neq = $root_anchor ne $id;
if ($neq || ($neq && $level != 0 && !$ctx->{flat})) {
$fhref = "${path}$href/f/";
- $more_ref = \$more;
}
# scan through all parts, looking for displayable text
$mime->walk_parts(sub {
- index_walk($fh, $_[0], $enc, \$part_nr, $fhref, $more_ref);
+ index_walk($fh, $_[0], $enc, \$part_nr, $fhref);
});
$mime->body_set('');
-
- my $txt = "${path}$href/raw";
- $rv = "\n<a\nhref=\"$mhref\">$more</a> <a\nhref=\"$txt\">raw</a> ";
- $rv .= html_footer($hdr, 0, undef, $ctx, $mhref);
+ $rv = "\n" . html_footer($hdr, 0, undef, $ctx, $mhref);
if (defined $irt) {
unless (defined $parent_anchor) {
if (my $pct = $state->{pct}) { # used by SearchView.pm
$rv .= " [relevance $pct->{$mid_raw}%]";
} elsif ($srch) {
+ my $threaded = 'threaded';
+ my $flat = 'flat';
if ($ctx->{flat}) {
- $rv .= " [<a\nhref=\"${path}$href/t/#u\">threaded</a>" .
- "|<b>flat</b>]";
+ $flat = "<b>$flat</b>";
} else {
- $rv .= " [<b>threaded</b>|" .
- "<a\nhref=\"${path}$href/T/#u\">flat</a>]";
+ $threaded = "<b>$threaded</b>";
}
+ $rv .= " [<a\nhref=\"${path}$href/t/#u\">$threaded</a>";
+ $rv .= "|<a\nhref=\"${path}$href/T/#u\">$flat</a>]";
}
$fh->write($rv .= '</pre>');
}
sub thread_html {
my ($ctx, $foot, $srch) = @_;
+ # $_[0] in sub is the Plack callback
sub { emit_thread_html($_[0], $ctx, $foot, $srch) }
}
# only private functions below.
sub emit_thread_html {
- my ($cb, $ctx, $foot, $srch) = @_;
+ my ($res, $ctx, $foot, $srch) = @_;
my $mid = $ctx->{mid};
- my $res = $srch->get_thread($mid);
- my $msgs = load_results($res);
+ my $msgs = load_results($srch->get_thread($mid));
my $nr = scalar @$msgs;
- return missing_thread($cb, $ctx) if $nr == 0;
+ return missing_thread($res, $ctx) if $nr == 0;
my $flat = $ctx->{flat};
- my $orig_cb = $cb;
my $seen = {};
my $state = {
+ res => $res,
ctx => $ctx,
seen => $seen,
root_anchor => anchor_for($mid),
};
require PublicInbox::Git;
- my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
+ $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
if ($flat) {
pre_anchor_entry($seen, $_) for (@$msgs);
- __thread_entry(\$cb, $git, $state, $_, 0) for (@$msgs);
+ __thread_entry($state, $_, 0) for (@$msgs);
} else {
my $th = thread_results($msgs);
- thread_entry(\$cb, $git, $state, $_, 0) for $th->rootset;
+ thread_entry($state, $_, 0) for $th->rootset;
if (my $max = $state->{cur_level}) {
- $cb->write(('</ul></li>' x ($max - 1)) . '</ul>');
+ $state->{fh}->write(
+ ('</ul></li>' x ($max - 1)) . '</ul>');
}
}
- $git = undef;
Email::Address->purge_cache;
# there could be a race due to a message being deleted in git
# but still being in the Xapian index:
- return missing_thread($cb, $ctx) if ($orig_cb eq $cb);
+ my $fh = delete $state->{fh} or return missing_thread($res, $ctx);
my $final_anchor = $state->{anchor_idx};
my $next = "<a\nid=s$final_anchor>";
$next .= "\ndownload thread: ";
$next .= "<a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>";
- $cb->write('<hr /><pre>' . $next . "\n\n".
+ $fh->write('<hr /><pre>' . $next . "\n\n".
$foot . '</pre></body></html>');
- $cb->close;
+ $fh->close;
}
sub index_walk {
- my ($fh, $part, $enc, $part_nr, $fhref, $more) = @_;
- my $s = add_text_body($enc, $part, $part_nr, $fhref);
+ my ($fh, $part, $enc, $part_nr, $fhref) = @_;
+ my $s = add_text_body($enc, $part, $part_nr, $fhref, 1);
return if $s eq '';
my ($dst, $ctx, $hdr, $upfx) = @_;
my $srch = $ctx->{srch};
my $mid = mid_clean($hdr->header_raw('Message-ID'));
- my $res = $srch->get_thread($mid);
- my $nr = $res->{total};
+ my $sres = $srch->get_thread($mid);
+ my $nr = $sres->{total};
my $expand = "<a\nhref=\"${upfx}t/#u\">expand</a> " .
"/ <a\nhref=\"${upfx}t.mbox.gz\">mbox.gz</a>";
seen => { $subj => 1 },
srch => $srch,
cur => $mid,
- parent_cmp => defined $parent ? $parent : '',
- parent => $parent,
prev_attr => '',
prev_level => 0,
};
- for (thread_results(load_results($res))->rootset) {
+ for (thread_results(load_results($sres))->rootset) {
inline_dump($dst, $state, $upfx, $_, 0);
}
$$dst .= "<a\nid=b></a>"; # anchor for body start
$ctx->{next_msg} = $state->{next_msg};
- $ctx->{parent_msg} = $state->{parent};
+ $ctx->{parent_msg} = $parent;
}
sub _parent_headers_nosrch {
}
sub thread_html_head {
- my ($cb, $header, $state) = @_;
- $$cb = $$cb->([200, ['Content-Type'=> 'text/html; charset=UTF-8']]);
+ my ($hdr, $state) = @_;
+ my $res = delete $state->{res} or die "BUG: no Plack callback in {res}";
+ my $fh = $res->([200, ['Content-Type'=> 'text/html; charset=UTF-8']]);
+ $state->{fh} = $fh;
- my $s = ascii_html($header->header('Subject'));
- $$cb->write("<html><head><title>$s</title>".
+ my $s = ascii_html($hdr->header('Subject'));
+ $fh->write("<html><head><title>$s</title>".
qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
qq!href="../t.atom"\ntype="application/atom+xml"/>! .
PublicInbox::Hval::STYLE .
}
sub thread_adj_level {
- my ($fh, $state, $level) = @_;
+ my ($state, $level) = @_;
my $max = $state->{cur_level};
if ($level <= 0) {
# reset existing lists
my $x = $max > 1 ? ('</ul></li>' x ($max - 1)) : '';
- $fh->write($x . '</ul>');
+ $state->{fh}->write($x . '</ul>');
$state->{cur_level} = 0;
return '';
}
if ($level == $max) { # continue existing list
- $fh->write('<li>');
+ $state->{fh}->write('<li>');
} elsif ($level < $max) {
my $x = $max > 1 ? ('</ul></li>' x ($max - $level)) : '';
- $fh->write($x .= '<li>');
+ $state->{fh}->write($x .= '<li>');
$state->{cur_level} = $level;
} else { # ($level > $max) # start a new level
$state->{cur_level} = $level;
- $fh->write(($max ? '<li>' : '') . '<ul><li>');
+ $state->{fh}->write(($max ? '<li>' : '') . '<ul><li>');
}
'</li>';
}
sub ghost_flush {
- my ($fh, $state, $upfx, $mid, $level) = @_;
-
- my $end = thread_adj_level($fh, $state, $level);
- $fh->write('<pre>'. ghost_parent($upfx, $mid) . '</pre>' . $end);
+ my ($state, $upfx, $mid, $level) = @_;
+ my $end = '<pre>'. ghost_parent($upfx, $mid) . '</pre>';
+ $state->{fh}->write($end .= thread_adj_level($state, $level));
}
sub __thread_entry {
- my ($cb, $git, $state, $mime, $level) = @_;
+ my ($state, $mime, $level) = @_;
# lazy load the full message from mini_mime:
$mime = eval {
my $path = mid2path(mid_clean(mid_mime($mime)));
- Email::MIME->new($git->cat_file('HEAD:'.$path));
+ Email::MIME->new($state->{ctx}->{git}->cat_file('HEAD:'.$path));
} or return;
- if ($state->{anchor_idx} == 0) {
- thread_html_head($cb, $mime, $state, $level);
- }
- my $fh = $$cb;
+ thread_html_head($mime, $state) if $state->{anchor_idx} == 0;
if (my $ghost = delete $state->{ghost}) {
# n.b. ghost messages may only be parents, not children
foreach my $g (@$ghost) {
- ghost_flush($fh, $state, '../../', @$g);
+ ghost_flush($state, '../../', @$g);
}
}
- my $end = thread_adj_level($fh, $state, $level);
- index_entry($fh, $mime, $level, $state);
- $fh->write($end) if $end;
+ my $end = thread_adj_level($state, $level);
+ index_entry($mime, $level, $state);
+ $state->{fh}->write($end) if $end;
1;
}
}
sub thread_entry {
- my ($cb, $git, $state, $node, $level) = @_;
+ my ($state, $node, $level) = @_;
return unless $node;
if (my $mime = $node->message) {
- unless (__thread_entry($cb, $git, $state, $mime, $level)) {
+ unless (__thread_entry($state, $mime, $level)) {
__ghost_prepare($state, $node, $level);
}
} else {
__ghost_prepare($state, $node, $level);
}
- thread_entry($cb, $git, $state, $node->child, $level + 1);
- thread_entry($cb, $git, $state, $node->next, $level);
+ thread_entry($state, $node->child, $level + 1);
+ thread_entry($state, $node->next, $level);
}
sub load_results {
- my ($res) = @_;
+ my ($sres) = @_;
- [ map { $_->mini_mime } @{delete $res->{msgs}} ];
+ [ map { $_->mini_mime } @{delete $sres->{msgs}} ];
}
sub msg_timestamp {
}
sub thread_results {
- my ($msgs, $nosubject) = @_;
+ my ($msgs, $nosubject, $nosort) = @_;
require PublicInbox::Thread;
my $th = PublicInbox::Thread->new(@$msgs);
+
+ # WARNING! both these Mail::Thread knobs were found by inspecting
+ # the Mail::Thread 2.55 source code, and we have some monkey patches
+ # in PublicInbox::Thread to fix memory leaks. Since Mail::Thread
+ # appears unmaintained, I suppose it's safe to depend on these
+ # variables for now:
no warnings 'once';
$Mail::Thread::nosubject = $nosubject;
+ # Keep ghosts with only a single direct child:
+ $Mail::Thread::noprune = 1;
$th->thread;
- $th->order(*sort_ts);
+ $th->order(*sort_ts) unless $nosort;
$th
}
sub missing_thread {
- my ($cb, $ctx) = @_;
+ my ($res, $ctx) = @_;
require PublicInbox::ExtMsg;
- $cb->(PublicInbox::ExtMsg::ext_msg($ctx))
+ $res->(PublicInbox::ExtMsg::ext_msg($ctx))
}
sub _msg_date {
if (my $mime = $node->message) {
my $hdr = $mime->header_obj;
my $mid = mid_clean($hdr->header_raw('Message-ID'));
- if ($mid eq $state->{parent_cmp}) {
- $state->{parent} = $mid;
- }
_inline_header($dst, $state, $upfx, $hdr, $level);
} else {
- my $dot = $level == 0 ? '' : '` ';
- my $pfx = (' ' x length(' 1970-01-01 13:37 ')).
- indent_for($level) . $dot;
- $$dst .= $pfx;
- $$dst .= ghost_parent("$upfx../", $node->messageid) . "\n";
+ my $mid = $node->messageid;
+ if ($mid eq 'subject dummy') {
+ $$dst .= "\t[no common parent]\n";
+ } else {
+ $$dst .= ' [not found] ';
+ my $dot = $level == 0 ? '' : '` ';
+ $$dst .= indent_for($level) . $dot;
+ $mid = PublicInbox::Hval->new_msgid($mid);
+ my $href = "$upfx../" . $mid->as_href . '/';
+ my $html = $mid->as_html;
+ $$dst .= qq{<<a\nhref="$href">$html</a>>\n};
+ }
}
inline_dump($dst, $state, $upfx, $node->child, $level+1);
inline_dump($dst, $state, $upfx, $node->next, $level);
} @_;
}
-sub rsort_ts {
- sort {
- (eval { $b->topmost->message->header('X-PI-TS') } || 0) <=>
- (eval { $a->topmost->message->header('X-PI-TS') } || 0)
- } @_;
-}
-
# accumulate recent topics if search is supported
# returns 1 if done, undef if not
sub add_topic {
add_topic($state, $node->next, $level);
}
-sub dump_topics {
+sub emit_topics {
my ($state) = @_;
my $order = $state->{order};
my $subjs = $state->{subjs};
my $latest = $state->{latest};
- return "\n[No topics in range]</pre>" unless (scalar @$order);
- my $dst = '';
+ my $fh = $state->{fh};
+ return $fh->write("\n[No topics in range]</pre>") unless scalar @$order;
my $pfx;
my $prev = 0;
my $prev_attr = '';
+ my $cur;
+ my @recent;
while (defined(my $info = shift @$order)) {
my ($level, $subj) = @$info;
my $n = delete $subjs->{$subj};
$subj = PublicInbox::Hval->new($subj)->as_html;
$pfx = indent_for($level);
my $nl = $level == $prev ? "\n" : '';
+ if ($nl && $cur) {
+ push @recent, $cur;
+ $cur = undef;
+ }
+ $cur ||= [ $ts, '' ];
my $dot = $level == 0 ? '' : '` ';
- $dst .= "$nl$pfx$dot<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
+ $cur->[0] = $ts if $ts > $cur->[0];
+ $cur->[1] .= "$nl$pfx$dot<a\nhref=\"$mid/t/#u\"><b>";
+ $cur->[1] .= $subj;
+ $cur->[1] .= "</b></a>\n";
- my $attr;
$ts = fmt_ts($ts);
- $attr = " $ts UTC";
+ my $attr = " $ts UTC";
# $n isn't the total number of posts on the topic,
- # just the number of posts in the current results
- # window, so leave it unlabeled
+ # just the number of posts in the current results window
$n = $n == 1 ? '' : " ($n+ messages)";
if ($level == 0 || $attr ne $prev_attr) {
my $mbox = qq(<a\nhref="$mid/t.mbox.gz">mbox.gz</a>);
my $atom = qq(<a\nhref="$mid/t.atom">Atom</a>);
$pfx .= INDENT if $level > 0;
- $dst .= $pfx . $attr . $n . " - $mbox / $atom\n";
+ $cur->[1] .= $pfx . $attr . $n . " - $mbox / $atom\n";
$prev_attr = $attr;
}
}
- $dst .= '</pre>';
+ push @recent, $cur if $cur;
+ @recent = map { $_->[1] } sort { $b->[0] <=> $a->[0] } @recent;
+ $fh->write(join('', @recent) . '</pre>');
}
sub emit_index_topics {
- my ($state, $fh) = @_;
+ my ($state) = @_;
my $off = $state->{ctx}->{cgi}->param('o');
$off = 0 unless defined $off;
$state->{order} = [];
my $max = 25;
my %opts = ( offset => int $off, limit => $max * 4 );
while (scalar @{$state->{order}} < $max) {
- my $res = $state->{srch}->query('', \%opts);
- my $nr = scalar @{$res->{msgs}} or last;
+ my $sres = $state->{srch}->query('', \%opts);
+ my $nr = scalar @{$sres->{msgs}} or last;
- for (rsort_ts(thread_results(load_results($res), 1)->rootset)) {
+ for (thread_results(load_results($sres), 1)->rootset) {
add_topic($state, $_, 0);
}
$opts{offset} += $nr;
}
- $fh->write(dump_topics($state));
+ emit_topics($state);
$opts{offset};
}