my $fh = $state->{fh};
$fh->write($rv .= "- $from @ $ts UTC (<a\nhref=\"$txt\">raw</a>)\n\n");
- my $fhref;
my $mhref = "${path}$href/";
- # 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/";
- }
# scan through all parts, looking for displayable text
$mime->walk_parts(sub {
- index_walk($fh, $_[0], $enc, \$part_nr, $fhref);
+ index_walk($fh, $_[0], $enc, \$part_nr);
});
$mime->body_set('');
$rv = "\n" . html_footer($hdr, 0, undef, $ctx, $mhref);
}
sub index_walk {
- my ($fh, $part, $enc, $part_nr, $fhref) = @_;
- my $s = add_text_body($enc, $part, $part_nr, $fhref, 1);
+ 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;
$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);
# 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 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};
}