use PublicInbox::MID qw/mid_clean id_compress mid2path/;
use Digest::SHA qw/sha1_hex/;
my $SALT = rand;
-my $MBOX_TITLE = 'title="download thread as gzipped mbox"';
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 PRE_WRAP => "<pre\nstyle=\"white-space:pre-wrap\">";
use constant T_ANCHOR => '#u';
use constant INDENT => ' ';
}
headers_to_html_header($mime, $full_pfx, $ctx) .
multipart_text_as_html($mime, $full_pfx) .
- '</pre><hr />' . PRE_WRAP .
+ '</pre><hr /><pre>' .
html_footer($mime, 1, $full_pfx, $ctx) .
$footer .
'</pre></body></html>';
sub feed_entry {
my ($class, $mime, $full_pfx) = @_;
- PRE_WRAP . multipart_text_as_html($mime, $full_pfx) . '</pre>';
+ # no <head> here for <style>...
+ PublicInbox::Hval::PRE .
+ multipart_text_as_html($mime, $full_pfx) . '</pre>';
}
sub in_reply_to {
$from = PublicInbox::Hval->new_oneline($from)->as_html;
$subj = PublicInbox::Hval->new_oneline($subj)->as_html;
- my $more = 'permalink';
my $root_anchor = $state->{root_anchor} || '';
my $path = $root_anchor ? '../../' : '';
my $href = $mid->as_href;
$subj = "<a\nhref=\"${path}$href/$t/#u\">$subj</a>";
}
if ($root_anchor eq $id) {
- $subj = "<u\nid=\"u\">$subj</u>";
+ $subj = "<u\nid=u>$subj</u>";
}
my $ts = _msg_date($mime);
- my $rv = "<table\nsummary=l$level><tr>";
- if ($level) {
- $rv .= '<td><pre>' . (INDENT x $level) . '</pre></td>';
- }
- $rv .= "<td\nid=s$midx>" . PRE_WRAP;
- $rv .= "<b\nid=\"$id\">$subj</b>\n";
+ 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) {
my ($fhref, $more_ref);
my $mhref = "${path}$href/";
+ my $more = 'permalink';
# show full message if it's our root message
- if ($root_anchor ne $id || ($level != 0 && !$ctx->{flat})) {
+ my $neq = $root_anchor ne $id;
+ if ($neq || ($neq && $level != 0 && !$ctx->{flat})) {
$fhref = "${path}$href/f/";
$more_ref = \$more;
}
}
$rv .= " <a\nhref=\"$parent_anchor\">parent</a>";
}
- if (my $pct = $state->{pct}) {
- $rv .= " [$pct->{$mid_raw}%]";
+ if (my $pct = $state->{pct}) { # used by SearchView.pm
+ $rv .= " [relevance $pct->{$mid_raw}%]";
} elsif ($srch) {
if ($ctx->{flat}) {
$rv .= " [<a\nhref=\"${path}$href/t/#u\">threaded</a>" .
"<a\nhref=\"${path}$href/T/#u\">flat</a>]";
}
}
-
- $fh->write($rv .= '</pre></td></tr></table>');
+ $fh->write($rv .= '</pre>');
}
sub thread_html {
seen => $seen,
root_anchor => anchor_for($mid),
anchor_idx => 0,
+ cur_level => 0,
};
- require PublicInbox::GitCatFile;
- my $git = PublicInbox::GitCatFile->new($ctx->{git_dir});
+ require PublicInbox::Git;
+ my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
if ($flat) {
pre_anchor_entry($seen, $_) for (@$msgs);
__thread_entry(\$cb, $git, $state, $_, 0) for (@$msgs);
} else {
my $th = thread_results($msgs);
thread_entry(\$cb, $git, $state, $_, 0) for $th->rootset;
+ if (my $max = $state->{cur_level}) {
+ $cb->write(('</ul></li>' x ($max - 1)) . '</ul>');
+ }
}
$git = undef;
Email::Address->purge_cache;
return missing_thread($cb, $ctx) if ($orig_cb eq $cb);
my $final_anchor = $state->{anchor_idx};
- my $next = "<a\nid=\"s$final_anchor\">";
+ my $next = "<a\nid=s$final_anchor>";
$next .= $final_anchor == 1 ? 'only message in' : 'end of';
$next .= " thread</a>, back to <a\nhref=\"../../\">index</a>";
$next .= "\ndownload thread: ";
- $next .= "<a\n$MBOX_TITLE\nhref=\"../t.mbox.gz\">mbox.gz</a>";
+ $next .= "<a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>";
- $cb->write("<hr />" . PRE_WRAP . $next . "\n\n". $foot .
- "</pre></body></html>");
+ $cb->write('<hr /><pre>' . $next . "\n\n".
+ $foot . '</pre></body></html>');
$cb->close;
}
my $s = add_text_body($enc, $part, $part_nr, $fhref);
if ($more) {
+ my $m = 0;
# drop the remainder of git patches, they're usually better
# to review when the full message is viewed
- $s =~ s!^---+\n.*\z!!ms and $$more = 'more...';
+ $s =~ s!^---+\n.*\z!!ms and $m = 1;
# Drop signatures
- $s =~ s/^-- \n.*\z//ms and $$more = 'more...';
+ $s =~ s/^-- \n.*\z//ms and $m = 1;
+ $$more = "<b>More...</b>\n\n$$more" if $m;
}
# kill any leading or trailing whitespace lines
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
} elsif ($h eq 'Subject') {
$title[0] = $v->as_html;
if ($srch) {
- my $p = $full_pfx ? '' : '../';
- $rv .= "$h: <a\nid=\"t\"\nhref=\"${p}t/#u\">";
- $rv .= $v->as_html . "</a>\n";
+ $rv .= "$h: <b\nid=t>";
+ $rv .= $v->as_html . "</b>\n";
next;
}
}
$rv .= "(<a\nhref=\"${upfx}raw\">raw</a>)\n";
my $atom;
if ($srch) {
- if ($header_obj->header('In-Reply-To') ||
- $header_obj->header('References')) {
- $rv .= "<a\nhref=\"${upfx}t/#u\">" .
- "References: [expand]</a>\n";
- }
+ thread_inline(\$rv, $ctx, $mime, $upfx);
$atom = qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
qq!href="${upfx}t.atom"\ntype="application/atom+xml"/>!;
}
$rv .= "\n";
- ("<html><head><title>". join(' - ', @title) .
- "</title>$atom</head><body>" . PRE_WRAP . $rv);
+ ("<html><head><title>". join(' - ', @title) . "</title>$atom".
+ PublicInbox::Hval::STYLE . "</head><body><pre>" . $rv);
}
sub thread_inline {
- my ($dst, $ctx, $cur, $full_pfx) = @_;
+ my ($dst, $ctx, $cur, $upfx) = @_;
my $srch = $ctx->{srch};
my $mid = mid_clean($cur->header('Message-ID'));
my $res = $srch->get_thread($mid);
my $nr = $res->{total};
- my $upfx = $full_pfx ? '' : '../';
- my $expand = "(<a\nhref=\"${upfx}t/#u\">expand</a> " .
- "/ <a\nhref=\"${upfx}t.mbox.gz\">mbox.gz</a>)";
+ my $expand = "<a\nhref=\"${upfx}t/#u\">expand</a> " .
+ "/ <a\nhref=\"${upfx}t.mbox.gz\">mbox.gz</a>";
+ $$dst .= 'Thread: ';
+ my $parent = in_reply_to($cur);
if ($nr <= 1) {
- $$dst .= "\n[no followups, yet] $expand\n";
- return (undef, in_reply_to($cur));
+ if (defined $parent) {
+ $$dst .= "($expand)\n ";
+ $$dst .= ghost_parent("$upfx../", $parent) . "\n";
+ } else {
+ $$dst .= "[no followups, yet] ($expand)\n";
+ }
+ $ctx->{next_msg} = undef;
+ $ctx->{parent_msg} = $parent;
+ return;
}
- $$dst .= "\n\n~$nr messages in thread: $expand\n";
+ $$dst .= "~$nr messages ($expand";
+ if ($nr > MAX_INLINE_QUOTED) {
+ $$dst .= qq! / <a\nhref="#b">[scroll down]</a>!;
+ }
+ $$dst .= ")\n";
my $subj = $srch->subject_path($cur->header('Subject'));
- my $parent = in_reply_to($cur);
my $state = {
seen => { $subj => 1 },
srch => $srch,
for (thread_results(load_results($res))->rootset) {
inline_dump($dst, $state, $upfx, $_, 0);
}
- ($state->{next_msg}, $state->{parent});
+ $$dst .= "<a\nid=b></a>"; # anchor for body start
+ $ctx->{next_msg} = $state->{next_msg};
+ $ctx->{parent_msg} = $state->{parent};
}
sub _parent_headers_nosrch {
my $srch = $ctx->{srch} if $ctx;
my $upfx = $full_pfx ? '../' : '../../';
+ my $tpfx = $full_pfx ? '' : '../';
my $idx = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
if ($srch && $standalone) {
- $idx .= qq{ / follow: <a\nhref="t.atom">Atom feed</a>};
+ $idx .= qq{ / follow: <a\nhref="${tpfx}t.atom">Atom feed</a>\n};
}
if ($idx && $srch) {
- my ($next, $p) = thread_inline(\$idx, $ctx, $mime, $full_pfx);
- if (defined $p) {
+ my $p = $ctx->{parent_msg};
+ my $next = $ctx->{next_msg};
+ if ($p) {
$p = PublicInbox::Hval->new_oneline($p);
$p = $p->as_href;
$irt = "<a\nhref=\"$upfx$p/\">parent</a> ";
if ($next) {
$irt .= "<a\nhref=\"$upfx$next/\">next</a> ";
} else {
- $irt .= ' ';
+ $irt .= ' ' x length('next ');
+ }
+ if ($p || $next) {
+ $irt .= "<a\nhref=\"${tpfx}t/#u\">thread</a> ";
+ } else {
+ $irt .= ' ' x length('thread ');
}
} else {
$irt = '';
$$cb->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 .
"</head><body>");
}
qq{[parent not found: <<a\nhref="$upfx$href/">$html</a>>]};
}
-sub ghost_table {
- my ($upfx, $mid, $level) = @_;
- "<table\nsummary=ghost><tr><td>" .
- (INDENT x $level) . "</td><td>" .
- PRE_WRAP . ghost_parent($upfx, $mid) .
- '</pre></td></table>';
+sub thread_adj_level {
+ my ($fh, $state, $level) = @_;
+
+ my $max = $state->{cur_level};
+ if ($level <= 0) {
+ return '' if $max == 0; # flat output
+
+ # reset existing lists
+ my $x = $max > 1 ? ('</ul></li>' x ($max - 1)) : '';
+ $fh->write($x . '</ul>');
+ $state->{cur_level} = 0;
+ return '';
+ }
+ if ($level == $max) { # continue existing list
+ $fh->write('<li>');
+ } elsif ($level < $max) {
+ my $x = $max > 1 ? ('</ul></li>' x ($max - $level)) : '';
+ $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>');
+ }
+ '</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);
}
sub __thread_entry {
} or return;
if ($state->{anchor_idx} == 0) {
- thread_html_head($cb, $mime, $state);
+ thread_html_head($cb, $mime, $state, $level);
}
-
+ my $fh = $$cb;
if (my $ghost = delete $state->{ghost}) {
# n.b. ghost messages may only be parents, not children
foreach my $g (@$ghost) {
- $$cb->write(ghost_table('../../', @$g));
+ ghost_flush($fh, $state, '../../', @$g);
}
}
- index_entry($$cb, $mime, $level, $state);
+ my $end = thread_adj_level($fh, $state, $level);
+ index_entry($fh, $mime, $level, $state);
+ $fh->write($end) if $end;
+
1;
}
-sub __ghost_entry {
+sub indent_for {
+ my ($level) = @_;
+ INDENT x ($level - 1);
+}
+
+sub __ghost_prepare {
my ($state, $node, $level) = @_;
my $ghost = $state->{ghost} ||= [];
push @$ghost, [ $node->messageid, $level ];
return unless $node;
if (my $mime = $node->message) {
unless (__thread_entry($cb, $git, $state, $mime, $level)) {
- __ghost_entry($state, $node, $level);
+ __ghost_prepare($state, $node, $level);
}
} else {
- __ghost_entry($state, $node, $level);
+ __ghost_prepare($state, $node, $level);
}
thread_entry($cb, $git, $state, $node->child, $level + 1);
sub _msg_date {
my ($mime) = @_;
my $ts = $mime->header('X-PI-TS') || msg_timestamp($mime);
- POSIX::strftime('%Y-%m-%d %H:%M', gmtime($ts));
+ fmt_ts($ts);
}
+sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
+
sub _inline_header {
my ($dst, $state, $upfx, $mime, $level) = @_;
- my $pfx = INDENT x ($level - 1);
my $dot = $level == 0 ? '' : '` ';
my $cur = $state->{cur};
my $mid = mid_clean($mime->header('Message-ID'));
my $f = $mime->header('X-PI-From');
my $d = _msg_date($mime);
- $f = PublicInbox::Hval->new($f)->as_html;
- $d = PublicInbox::Hval->new($d)->as_html;
- my $attr = "$f @ $d";
+ $f = PublicInbox::Hval->new_oneline($f)->as_html;
+ my $pfx = ' ' . $d . ' ' . indent_for($level);
+ my $attr = $f;
$state->{first_level} ||= $level;
+
if ($attr ne $state->{prev_attr} || $state->{prev_level} > $level) {
$state->{prev_attr} = $attr;
- $attr = ' - ' . $attr;
- $attr .= ' UTC' if $level >= $state->{first_level};
} else {
$attr = '';
}
if ($cur) {
if ($cur eq $mid) {
delete $state->{cur};
- $$dst .= "$pfx$dot<b><a\nid=\"r\"\nhref=\"#t\">".
- "[this message]</a></b>$attr\n";
+ $$dst .= "$pfx$dot<b><a\nid=r\nhref=\"#b\">".
+ "$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";
+ $$dst .= "$pfx$dot<a\nhref=\"$m\">$s</a> $attr\n";
} else {
- $$dst .= "$pfx$dot<a\nhref=\"$m\">$f @ $d</a>\n";
+ $$dst .= "$pfx$dot<a\nhref=\"$m\">$f</a>\n";
}
}
_inline_header($dst, $state, $upfx, $mime, $level);
} else {
my $dot = $level == 0 ? '' : '` ';
- my $pfx = (INDENT x $level) . $dot;
+ my $pfx = (' ' x length(' 1970-01-01 13:37 ')).
+ indent_for($level) . $dot;
$$dst .= $pfx;
$$dst .= ghost_parent("$upfx../", $node->messageid) . "\n";
}
if (my $x = $node->message) {
$x = $x->header_obj;
- my ($topic, $subj);
+ my $subj;
$subj = $x->header('Subject');
$subj = $state->{srch}->subject_normalized($subj);
- $topic = $subj;
-
- # kill "[PATCH v2]" etc. for summarization
- unless ($level == 0) {
- $topic =~ s/\A\s*\[[^\]]+\]\s*//g;
- }
- $topic = substr($topic, 0, 30);
- if (++$state->{subjs}->{$topic} == 1) {
- push @{$state->{order}}, [ $level, $subj, $topic ];
+ if (++$state->{subjs}->{$subj} == 1) {
+ push @{$state->{order}}, [ $level, $subj ];
}
my $mid = mid_clean($x->header('Message-ID'));
my $ts = $x->header('X-PI-TS');
- my $exist = $state->{latest}->{$topic};
+ my $exist = $state->{latest}->{$subj};
if (!$exist || $exist->[1] < $ts) {
- $state->{latest}->{$topic} = [ $mid, $ts ];
+ $state->{latest}->{$subj} = [ $mid, $ts ];
}
} else {
# ghost message, do not bump level
my $order = $state->{order};
my $subjs = $state->{subjs};
my $latest = $state->{latest};
- return "\n[No recent topics]</pre>" unless (scalar @$order);
+ return "\n[No topics in range]</pre>" unless (scalar @$order);
my $dst = '';
my $pfx;
my $prev = 0;
my $prev_attr = '';
while (defined(my $info = shift @$order)) {
- my ($level, $subj, $topic) = @$info;
- my $n = delete $subjs->{$topic};
- my ($mid, $ts) = @{delete $latest->{$topic}};
- $mid = PublicInbox::Hval->new($mid)->as_href;
+ my ($level, $subj) = @$info;
+ my $n = delete $subjs->{$subj};
+ my ($mid, $ts) = @{delete $latest->{$subj}};
+ $mid = PublicInbox::Hval->new_msgid($mid)->as_href;
$subj = PublicInbox::Hval->new($subj)->as_html;
- $pfx = INDENT x ($level - 1);
+ $pfx = indent_for($level);
my $nl = $level == $prev ? "\n" : '';
my $dot = $level == 0 ? '' : '` ';
$dst .= "$nl$pfx$dot<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
my $attr;
- $ts = POSIX::strftime('%Y-%m-%d %H:%M', gmtime($ts));
- if ($n == 1) {
- $attr = "@ $ts UTC";
- $n = "";
- } else {
- # $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
- $attr = "@ $ts UTC";
- $n = " ($n)";
- }
+ $ts = fmt_ts($ts);
+ $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
+ $n = $n == 1 ? '' : " ($n+ messages)";
+
if ($level == 0 || $attr ne $prev_attr) {
- my $mbox = qq(<a\n$MBOX_TITLE\n) .
- qq(href="$mid/t.mbox.gz">mbox.gz</a>);
+ 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";