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>";
- }
+ my $txt = "${path}$href/raw";
my $fh = $state->{fh};
- $fh->write($rv .= "\n\n");
+ $fh->write($rv .= "- $from @ $ts UTC (<a\nhref=\"$txt\">raw</a>)\n\n");
- my ($fhref, $more_ref);
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);
});
$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 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) = @_;
+ my $s = add_text_body($enc, $part, $part_nr, 1);
return if $s eq '';
# scan through all parts, looking for displayable text
$mime->walk_parts(sub {
my ($part) = @_;
- $part = add_text_body($enc, $part, \$part_nr, $full_pfx, 1);
+ $part = add_text_body($enc, $part, \$part_nr, 1);
$rv .= $part;
$rv .= "\n" if $part ne '';
});
}
sub flush_quote {
- my ($quot, $n, $part_nr, $full_pfx, $final, $do_anchor) = @_;
-
- # n.b.: do not use <blockquote> since it screws up alignment
- # w.r.t. unquoted text. Repliers may rely on pre-formatted
- # alignment to point out a certain word in quoted text.
- if ($full_pfx) {
- if (!$final && scalar(@$quot) <= MAX_INLINE_QUOTED) {
- # show quote inline
- my $l = PublicInbox::Linkify->new;
- my $rv = join('', map { $l->linkify_1($_) } @$quot);
- @$quot = ();
- $rv = ascii_html($rv);
- return $l->linkify_2($rv);
- }
+ my ($quot, $n, $part_nr, $final, $do_anchor) = @_;
- # show a short snippet of quoted text and link to full version:
- @$quot = map { s/^(?:>\s*)+//gm; $_ } @$quot;
- my $cur = join(' ', @$quot);
- @$quot = split(/\s+/, $cur);
- $cur = '';
- do {
- my $tmp = shift(@$quot);
- my $len = length($tmp) + length($cur);
- if ($len > MAX_TRUNC_LEN) {
- @$quot = ();
- } else {
- $cur .= $tmp . ' ';
- }
- } while (@$quot && length($cur) < MAX_TRUNC_LEN);
- @$quot = ();
- $cur =~ s/ \z/ .../s;
- $cur = ascii_html($cur);
- my $nr = ++$$n;
- "> [<a\nhref=\"$full_pfx#q${part_nr}_$nr\">$cur</a>]\n";
- } else {
- # show everything in the full version with anchor from
- # short version (see above)
- my $l = PublicInbox::Linkify->new;
- my $rv .= join('', map { $l->linkify_1($_) } @$quot);
- @$quot = ();
- $rv = ascii_html($rv);
- return $l->linkify_2($rv) unless $do_anchor;
- my $nr = ++$$n;
- "<a\nid=q${part_nr}_$nr></a>" . $l->linkify_2($rv);
- }
+ # show everything in the full version with anchor from
+ # short version (see above)
+ my $l = PublicInbox::Linkify->new;
+ my $rv .= join('', map { $l->linkify_1($_) } @$quot);
+ @$quot = ();
+ $rv = ascii_html($rv);
+ return $l->linkify_2($rv) unless $do_anchor;
+ my $nr = ++$$n;
+ qq(<a\nid="q${part_nr}_$nr"></a>) . $l->linkify_2($rv);
}
sub add_text_body {
- my ($enc_msg, $part, $part_nr, $full_pfx, $do_anchor) = @_;
+ my ($enc_msg, $part, $part_nr, $do_anchor) = @_;
return '' if $part->subparts;
my $ct = $part->content_type;
# show the previously buffered quote inline
if (scalar @quot) {
$s .= flush_quote(\@quot, \$n, $$part_nr,
- $full_pfx, 0, $do_anchor);
+ 0, $do_anchor);
}
# regular line, OK
}
}
if (scalar @quot) {
- $s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1,
- $do_anchor);
+ $s .= flush_quote(\@quot, \$n, $$part_nr, 1, $do_anchor);
}
++$$part_nr;
seen => { $subj => 1 },
srch => $srch,
cur => $mid,
- parent_cmp => defined $parent ? $parent : '',
- parent => $parent,
prev_attr => '',
prev_level => 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 {
$irt = '';
}
- $mhref = './' unless defined $mhref;
- $irt . qq(<a\nhref="${mhref}R/">reply</a>) . $idx;
+ $irt . qq(<a\nhref="${tpfx}R/">reply</a>) . $idx;
}
sub linkify_ref_nosrch {
}
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
}
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";
$ts = fmt_ts($ts);
my $attr = " $ts UTC";
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 $sres = $state->{srch}->query('', \%opts);
my $nr = scalar @{$sres->{msgs}} or last;
- for (rsort_ts(thread_results(load_results($sres), 1)->rootset)){
+ for (thread_results(load_results($sres), 1)->rootset) {
add_topic($state, $_, 0);
}
$opts{offset} += $nr;
}
- $state->{fh}->write(dump_topics($state));
+ emit_topics($state);
$opts{offset};
}