use PublicInbox::MID qw/mid_clean id_compress mid2path mid_mime/;
require POSIX;
-# TODO: make these constants tunable
-use constant MAX_INLINE_QUOTED => 12; # half an 80x24 terminal
-use constant MAX_TRUNC_LEN => 72;
-use constant T_ANCHOR => '#u';
use constant INDENT => ' ';
+use constant TCHILD => '` ';
+sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
my $enc_utf8 = find_encoding('UTF-8');
# public functions:
sub msg_html {
- my ($ctx, $mime, $full_pfx, $footer) = @_;
+ my ($ctx, $mime, $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) .
+ headers_to_html_header($hdr, $ctx) .
+ multipart_text_as_html($mime) .
'</pre><hr /><pre>' .
- html_footer($hdr, 1, $full_pfx, $ctx) .
+ html_footer($hdr, 1, $ctx, 'R/') .
$footer .
'</pre></body></html>';
}
}
sub feed_entry {
- my ($class, $mime, $full_pfx) = @_;
+ my ($class, $mime) = @_;
# no <head> here for <style>...
- PublicInbox::Hval::PRE .
- multipart_text_as_html($mime, $full_pfx) . '</pre>';
+ PublicInbox::Hval::PRE . multipart_text_as_html($mime) . '</pre>';
}
sub in_reply_to {
index_walk($fh, $_[0], $enc, \$part_nr);
});
$mime->body_set('');
- $rv = "\n" . html_footer($hdr, 0, undef, $ctx, $mhref);
+ $rv = "\n" . html_footer($hdr, 0, $ctx, "$path$href/R");
if (defined $irt) {
unless (defined $parent_anchor) {
} elsif ($srch) {
my $threaded = 'threaded';
my $flat = 'flat';
+ my $end = '';
if ($ctx->{flat}) {
$flat = "<b>$flat</b>";
+ $end = "\n"; # for lynx
} else {
$threaded = "<b>$threaded</b>";
}
$rv .= " [<a\nhref=\"${path}$href/t/#u\">$threaded</a>";
- $rv .= "|<a\nhref=\"${path}$href/T/#u\">$flat</a>]";
+ $rv .= "|<a\nhref=\"${path}$href/T/#u\">$flat</a>]$end";
}
$fh->write($rv .= '</pre>');
}
sub emit_thread_html {
my ($res, $ctx, $foot, $srch) = @_;
my $mid = $ctx->{mid};
- my $msgs = load_results($srch->get_thread($mid));
+ my $flat = $ctx->{flat};
+ my $msgs = load_results($srch->get_thread($mid, { asc => $flat }));
my $nr = scalar @$msgs;
return missing_thread($res, $ctx) if $nr == 0;
- my $flat = $ctx->{flat};
my $seen = {};
my $state = {
res => $res,
sub index_walk {
my ($fh, $part, $enc, $part_nr) = @_;
- my $s = add_text_body($enc, $part, $part_nr, 1);
+ my $s = add_text_body($enc, $part, $part_nr);
return if $s eq '';
}
sub multipart_text_as_html {
- my ($mime, $full_pfx, $srch) = @_;
+ my ($mime) = @_;
my $rv = "";
my $part_nr = 0;
my $enc = enc_for($mime->header("Content-Type"));
# scan through all parts, looking for displayable text
$mime->walk_parts(sub {
my ($part) = @_;
- $part = add_text_body($enc, $part, \$part_nr, 1);
+ $part = add_text_body($enc, $part, \$part_nr);
$rv .= $part;
$rv .= "\n" if $part ne '';
});
}
sub flush_quote {
- my ($quot, $n, $part_nr, $final, $do_anchor) = @_;
+ my ($s, $l, $quot, $part_nr) = @_;
# 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);
+ my $rv = $l->linkify_1(join('', @$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);
+
+ # we use a <div> here to allow users to specify their own
+ # color for quoted text
+ $rv = $l->linkify_2(ascii_html($rv));
+ $$s .= qq(<span\nclass="q">) . $rv . '</span>'
}
sub add_text_body {
- my ($enc_msg, $part, $part_nr, $do_anchor) = @_;
+ my ($enc_msg, $part, $part_nr) = @_;
return '' if $part->subparts;
my $ct = $part->content_type;
return '';
}
my $enc = enc_for($ct, $enc_msg);
- my $n = 0;
- my $nr = 0;
my $s = $part->body;
$part->body_set('');
$s = $enc->decode($s);
}
my @quot;
+ my $l = PublicInbox::Linkify->new;
while (defined(my $cur = shift @lines)) {
if ($cur !~ /^>/) {
# show the previously buffered quote inline
- if (scalar @quot) {
- $s .= flush_quote(\@quot, \$n, $$part_nr,
- 0, $do_anchor);
- }
+ flush_quote(\$s, $l, \@quot, $$part_nr) if @quot;
# regular line, OK
- my $l = PublicInbox::Linkify->new;
$cur = $l->linkify_1($cur);
$cur = ascii_html($cur);
$s .= $l->linkify_2($cur);
push @quot, $cur;
}
}
- if (scalar @quot) {
- $s .= flush_quote(\@quot, \$n, $$part_nr, 1, $do_anchor);
- }
+
+ flush_quote(\$s, $l, \@quot, $$part_nr) if @quot;
++$$part_nr;
$s =~ s/[ \t]+$//sgm; # kill per-line trailing whitespace
}
sub headers_to_html_header {
- my ($hdr, $full_pfx, $ctx) = @_;
+ my ($hdr, $ctx) = @_;
my $srch = $ctx->{srch} if $ctx;
- my $rv = "";
+ my $atom = '';
+ my $rv = '';
+ my $upfx = '';
+
+ if ($srch) {
+ $atom = qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
+ qq!href="${upfx}t.atom"\ntype="application/atom+xml"/>!;
+ }
+
my @title;
my $mid = $hdr->header_raw('Message-ID');
$mid = PublicInbox::Hval->new_msgid($mid);
} elsif ($h eq 'Subject') {
$title[0] = $v->as_html;
if ($srch) {
- $rv .= "$h: <b\nid=t>";
- $rv .= $v->as_html . "</b>\n";
+ $rv .= qq($h: <a\nhref="#r"\nid=t>);
+ $rv .= $v->as_html . "</a>\n";
next;
}
}
}
$rv .= 'Message-ID: <' . $mid->as_html . '> ';
- my $upfx = $full_pfx ? '' : '../';
$rv .= "(<a\nhref=\"${upfx}raw\">raw</a>)\n";
- my $atom;
- if ($srch) {
- thread_inline(\$rv, $ctx, $hdr, $upfx);
-
- $atom = qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
- qq!href="${upfx}t.atom"\ntype="application/atom+xml"/>!;
- } else {
- $rv .= _parent_headers_nosrch($hdr);
- $atom = '';
- }
+ $rv .= _parent_headers($hdr, $srch);
$rv .= "\n";
("<html><head><title>". join(' - ', @title) . "</title>$atom".
- PublicInbox::Hval::STYLE . "</head><body><pre>" . $rv);
+ PublicInbox::Hval::STYLE .
+ "</head><body><pre\nid=b>" . # anchor for body start
+ $rv);
}
-sub thread_inline {
- my ($dst, $ctx, $hdr, $upfx) = @_;
+sub thread_skel {
+ my ($dst, $ctx, $hdr, $tpfx) = @_;
my $srch = $ctx->{srch};
my $mid = mid_clean($hdr->header_raw('Message-ID'));
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>";
+ my $expand = qq(<a\nhref="${tpfx}t/#u">expand</a> ) .
+ qq(/ <a\nhref="${tpfx}t.mbox.gz">mbox.gz</a> ) .
+ qq(/ <a\nhref="${tpfx}t.atom">Atom feed</a>);
- $$dst .= 'Thread: ';
my $parent = in_reply_to($hdr);
if ($nr <= 1) {
if (defined $parent) {
$$dst .= "($expand)\n ";
- $$dst .= ghost_parent("$upfx../", $parent) . "\n";
+ $$dst .= ghost_parent("$tpfx../", $parent) . "\n";
} else {
$$dst .= "[no followups, yet] ($expand)\n";
}
return;
}
- $$dst .= "~$nr messages ($expand";
- if ($nr > MAX_INLINE_QUOTED) {
- $$dst .= qq! / <a\nhref="#b">[scroll down]</a>!;
- }
- $$dst .= ")\n";
+ $$dst .= "$nr+ messages in thread ($expand";
+ $$dst .= qq! / <a\nhref="#b">[top]</a>)\n!;
my $subj = $srch->subject_path($hdr->header('Subject'));
my $state = {
prev_level => 0,
};
for (thread_results(load_results($sres))->rootset) {
- inline_dump($dst, $state, $upfx, $_, 0);
+ skel_dump($dst, $state, $tpfx, $_, 0);
}
- $$dst .= "<a\nid=b></a>"; # anchor for body start
$ctx->{next_msg} = $state->{next_msg};
$ctx->{parent_msg} = $parent;
}
-sub _parent_headers_nosrch {
- my ($hdr) = @_;
+sub _parent_headers {
+ my ($hdr, $srch) = @_;
my $rv = '';
my $irt = in_reply_to($hdr);
$rv .= "<a\nhref=\"../$href/\">$html</a>>\n";
}
+ # do not display References: if search is present,
+ # we show the thread skeleton at the bottom, instead.
+ return $rv if $srch;
+
my $refs = $hdr->header_raw('References');
if ($refs) {
# avoid redundant URLs wasting bandwidth
}
sub html_footer {
- my ($mime, $standalone, $full_pfx, $ctx, $mhref) = @_;
+ my ($hdr, $standalone, $ctx, $rhref) = @_;
my $srch = $ctx->{srch} if $ctx;
- my $upfx = $full_pfx ? '../' : '../../';
- my $tpfx = $full_pfx ? '' : '../';
+ my $upfx = '../';
+ my $tpfx = '';
my $idx = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
my $irt = '';
-
- if ($srch && $standalone) {
- $idx .= qq{ / follow: <a\nhref="${tpfx}t.atom">Atom feed</a>\n};
- }
if ($idx && $srch) {
+ $idx .= "\n";
+ thread_skel(\$idx, $ctx, $hdr, $tpfx);
my $p = $ctx->{parent_msg};
my $next = $ctx->{next_msg};
if ($p) {
$p = PublicInbox::Hval->new_msgid($p);
$p = $p->as_href;
- $irt = "<a\nhref=\"$upfx$p/\">parent</a> ";
+ $irt = "<a\nhref=\"$upfx$p/\"rel=prev>parent</a> ";
} else {
$irt = ' ' x length('parent ');
}
if ($next) {
- $irt .= "<a\nhref=\"$upfx$next/\">next</a> ";
+ $irt .= "<a\nhref=\"$upfx$next/\"\nrel=next>next</a> ";
} else {
$irt .= ' ' x length('next ');
}
- if ($p || $next) {
- $irt .= "<a\nhref=\"${tpfx}t/#u\">thread</a> ";
- } else {
- $irt .= ' ' x length('thread ');
- }
} else {
$irt = '';
}
- $irt . qq(<a\nhref="${tpfx}R/">reply</a>) . $idx;
+ $irt . qq(<a\nhref="$rhref">reply</a>) . $idx;
}
sub linkify_ref_nosrch {
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
-sub _inline_header {
+sub _skel_header {
my ($dst, $state, $upfx, $hdr, $level) = @_;
- my $dot = $level == 0 ? '' : '` ';
my $cur = $state->{cur};
my $mid = mid_clean($hdr->header_raw('Message-ID'));
my $f = ascii_html($hdr->header('X-PI-From'));
my $d = _msg_date($hdr);
- my $pfx = ' ' . $d . ' ' . indent_for($level);
+ my $pfx = "$d " . indent_for($level) . th_pfx($level);
my $attr = $f;
$state->{first_level} ||= $level;
if ($cur) {
if ($cur eq $mid) {
delete $state->{cur};
- $$dst .= "$pfx$dot<b><a\nid=r\nhref=\"#b\">".
+ $$dst .= "$pfx<b><a\nid=r\nhref=\"#t\">".
"$attr [this message]</a></b>\n";
return;
}
my $m = PublicInbox::Hval->new_msgid($mid);
$m = $upfx . '../' . $m->as_href . '/';
- if (defined $s) {
- $$dst .= "$pfx$dot<a\nhref=\"$m\">$s</a> $attr\n";
- } else {
- $$dst .= "$pfx$dot<a\nhref=\"$m\">$f</a>\n";
- }
+ $$dst .= "$pfx<a\nhref=\"$m\">";
+ $$dst .= defined($s) ? "$s</a> $f\n" : "$f</a>\n";
}
-sub inline_dump {
+sub skel_dump {
my ($dst, $state, $upfx, $node, $level) = @_;
return unless $node;
if (my $mime = $node->message) {
my $hdr = $mime->header_obj;
my $mid = mid_clean($hdr->header_raw('Message-ID'));
- _inline_header($dst, $state, $upfx, $hdr, $level);
+ _skel_header($dst, $state, $upfx, $hdr, $level);
} else {
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;
+ $$dst .= ' [not found] ';
+ $$dst .= indent_for($level) . th_pfx($level);
$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);
+ skel_dump($dst, $state, $upfx, $node->child, $level+1);
+ skel_dump($dst, $state, $upfx, $node->next, $level);
}
sub sort_ts {
$cur = undef;
}
$cur ||= [ $ts, '' ];
- my $dot = $level == 0 ? '' : '` ';
$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";
+ $cur->[1] .= $nl . $pfx . th_pfx($level) .
+ "<a\nhref=\"$mid/t/#u\"><b>" .
+ $subj . "</b></a>\n";
$ts = fmt_ts($ts);
my $attr = " $ts UTC";