cur => $mid,
parent_cmp => defined $parent ? $parent : '',
parent => $parent,
+ prev_attr => '',
+ prev_level => 0,
};
for (thread_results(load_results($res))->rootset) {
inline_dump($dst, $state, $upfx, $_, 0);
sub _inline_header {
my ($dst, $state, $upfx, $mime, $level) = @_;
- my $pfx = INDENT x $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);
- $d = PublicInbox::Hval->new($d);
- $f = $f->as_html;
- $d = $d->as_html . ' UTC';
+ $f = PublicInbox::Hval->new($f)->as_html;
+ $d = PublicInbox::Hval->new($d)->as_html;
+ my $attr = "$f @ $d";
+ $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 = '';
+ }
+ $state->{prev_level} = $level;
+
if ($cur) {
if ($cur eq $mid) {
delete $state->{cur};
- $$dst .= "$pfx` <b><a\nid=\"r\"\nhref=\"#t\">".
- "[this message]</a></b> by $f @ $d\n";
+ $$dst .= "$pfx$dot<b><a\nid=\"r\"\nhref=\"#t\">".
+ "[this message]</a></b>$attr\n";
return;
}
my $m = PublicInbox::Hval->new_msgid($mid);
$m = $upfx . '../' . $m->as_href . '/';
if (defined $s) {
- $$dst .= "$pfx` <a\nhref=\"$m\">$s</a>\n" .
- "$pfx $f @ $d\n";
+ $$dst .= "$pfx$dot<a\nhref=\"$m\">$s</a>$attr\n";
} else {
- $$dst .= "$pfx` <a\nhref=\"$m\">$f @ $d</a>\n";
+ $$dst .= "$pfx$dot<a\nhref=\"$m\">$f @ $d</a>\n";
}
}
}
_inline_header($dst, $state, $upfx, $mime, $level);
} else {
- my $pfx = INDENT x $level;
- $$dst .= $pfx . '` ' . ghost_parent($upfx, $node->messageid);
+ my $dot = $level == 0 ? '' : '` ';
+ my $pfx = (INDENT x $level) . $dot;
+ $$dst .= $pfx . ghost_parent($upfx, $node->messageid) . "\n";
}
inline_dump($dst, $state, $upfx, $node->child, $level+1);
inline_dump($dst, $state, $upfx, $node->next, $level);
sub add_topic {
my ($state, $node, $level) = @_;
return unless $node;
+ my $child_adjust = 1;
if (my $x = $node->message) {
$x = $x->header_obj;
my $u = $x->header('X-PI-From');
my $ts = $x->header('X-PI-TS');
$state->{latest}->{$topic} = [ $mid, $u, $ts ];
- } # else { } # ghost ignored...
+ } else {
+ # ghost message, do not bump level
+ $child_adjust = 0;
+ }
- add_topic($state, $node->child, $level + 1);
+ add_topic($state, $node->child, $level + $child_adjust);
add_topic($state, $node->next, $level);
}
$mid = PublicInbox::Hval->new($mid)->as_href;
$subj = PublicInbox::Hval->new($subj)->as_html;
$u = PublicInbox::Hval->new($u)->as_html;
- $pfx = INDENT x $level;
+ $pfx = INDENT x ($level - 1);
my $nl = $level == $prev ? "\n" : '';
- my $dot = $level == 0 ? '' : '`';
+ my $dot = $level == 0 ? '' : '` ';
$dst .= "$nl$pfx$dot<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
my $attr;
$n = " ($n)\n";
}
if ($level == 0 || $attr ne $prev_attr) {
- $dst .= "$pfx - ". $attr . $n;
+ $pfx .= INDENT if $level > 0;
+ $dst .= "$pfx- ". $attr . $n;
$prev_attr = $attr;
}
}