use constant MAX_TRUNC_LEN => 72;
use constant PRE_WRAP => "<pre\nstyle=\"white-space:pre-wrap\">";
use constant T_ANCHOR => '#u';
+use constant INDENT => ' ';
*ascii_html = *PublicInbox::Hval::ascii_html;
my $ts = _msg_date($mime);
my $rv = "<table\nsummary=l$level><tr>";
if ($level) {
- $rv .= '<td><pre>' . (' ' x $level) . '</pre></td>';
+ $rv .= '<td><pre>' . (INDENT x $level) . '</pre></td>';
}
$rv .= "<td\nid=s$midx>" . PRE_WRAP;
$rv .= "<b\nid=\"$id\">$subj</b>\n";
sub emit_thread_html {
my ($cb, $ctx, $foot, $srch) = @_;
- my $mid = mid_compress($ctx->{mid});
+ my $mid = $ctx->{mid};
my $res = $srch->get_thread($mid);
my $msgs = load_results($res);
my $nr = scalar @$msgs;
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>";
- if ($flat) {
- $next .= " [<a\nhref=\"../t/#u\">threaded</a>|<b>flat</b>]";
- } else {
- $next .= " [<b>threaded</b>|<a\nhref=\"../T/#u\">flat</a>]";
- }
$next .= "\ndownload thread: <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 .
# scan through all parts, looking for displayable text
$mime->walk_parts(sub {
my ($part) = @_;
- $rv .= add_text_body($enc, $part, \$part_nr, $full_pfx);
+ $rv .= add_text_body($enc, $part, \$part_nr, $full_pfx, 1);
});
$mime->body_set('');
$rv;
}
sub flush_quote {
- my ($quot, $n, $part_nr, $full_pfx, $final) = @_;
+ my ($quot, $n, $part_nr, $full_pfx, $final, $do_anchor) = @_;
if ($full_pfx) {
if (!$final && scalar(@$quot) <= MAX_INLINE_QUOTED) {
} else {
# show everything in the full version with anchor from
# short version (see above)
- my $nr = ++$$n;
- my $rv = "";
my %l;
- $rv .= join('', map { linkify_1(\%l, $_) } @$quot);
+ my $rv .= join('', map { linkify_1(\%l, $_) } @$quot);
@$quot = ();
$rv = ascii_html($rv);
+ return linkify_2(\%l, $rv) unless $do_anchor;
+ my $nr = ++$$n;
"<a\nid=q${part_nr}_$nr></a>" . linkify_2(\%l, $rv);
}
}
sub add_text_body {
- my ($enc_msg, $part, $part_nr, $full_pfx) = @_;
+ my ($enc_msg, $part, $part_nr, $full_pfx, $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);
+ $full_pfx, 0, $do_anchor);
}
# regular line, OK
push @quot, $cur;
}
}
- $s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1) if scalar @quot;
+ if (scalar @quot) {
+ $s .= flush_quote(\@quot, \$n, $$part_nr, $full_pfx, 1,
+ $do_anchor);
+ }
$s .= "\n" unless $s =~ /\n\z/s;
++$$part_nr;
$s;
sub thread_inline {
my ($dst, $ctx, $cur, $full_pfx) = @_;
my $srch = $ctx->{srch};
- my $mid = mid_compress(mid_clean($cur->header('Message-ID')));
+ my $mid = mid_clean($cur->header('Message-ID'));
my $res = $srch->get_thread($mid);
my $nr = $res->{total};
seen => { $subj => 1 },
srch => $srch,
cur => $mid,
- parent_cmp => $parent ? mid_compress($parent) : '',
+ 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);
$seen->{$id} = "#$id"; # save the anchor for children, later
}
+sub ghost_parent {
+ my ($upfx, $mid) = @_;
+ # 'subject dummy' is used internally by Mail::Thread
+ return '[no common parent]' if ($mid eq 'subject dummy');
+
+ $mid = PublicInbox::Hval->new_msgid($mid);
+ my $href = $mid->as_href;
+ my $html = $mid->as_html;
+ qq{[parent not found: <<a\nhref="$upfx../$href/">$html</a>>]};
+}
+
sub __thread_entry {
my ($cb, $git, $state, $mime, $level) = @_;
# lazy load the full message from mini_mime:
- my $path = mid2path(mid_clean($mime->header('Message-ID')));
- $mime = eval { Email::MIME->new($git->cat_file("HEAD:$path")) };
- if ($mime) {
- if ($state->{anchor_idx} == 0) {
- thread_html_head($cb, $mime);
+ $mime = eval {
+ my $path = mid2path(mid_clean($mime->header('Message-ID')));
+ Email::MIME->new($git->cat_file('HEAD:'.$path));
+ } or return;
+
+ if ($state->{anchor_idx} == 0) {
+ thread_html_head($cb, $mime, $state);
+ }
+
+ if (my $ghost = delete $state->{ghost}) {
+ # n.b. ghost messages may only be parents, not children
+ foreach my $g (@$ghost) {
+ $$cb->write("<table\nsummary=ghost><tr><td>" .
+ (INDENT x $g->[1]) . "</td><td>" .
+ PRE_WRAP . ghost_parent('', $g->[0]) .
+ '</pre></td></table>');
}
- index_entry($$cb, $mime, $level, $state);
}
+ index_entry($$cb, $mime, $level, $state);
+ 1;
+}
+
+sub __ghost_entry {
+ my ($state, $node, $level) = @_;
+ my $ghost = $state->{ghost} ||= [];
+ push @$ghost, [ $node->messageid, $level ];
}
sub thread_entry {
my ($cb, $git, $state, $node, $level) = @_;
return unless $node;
if (my $mime = $node->message) {
- __thread_entry($cb, $git, $state, $mime, $level);
+ unless (__thread_entry($cb, $git, $state, $mime, $level)) {
+ __ghost_entry($state, $node, $level);
+ }
+ } else {
+ __ghost_entry($state, $node, $level);
}
+
thread_entry($cb, $git, $state, $node->child, $level + 1);
thread_entry($cb, $git, $state, $node->next, $level);
}
}
sub thread_results {
- my ($msgs) = @_;
+ my ($msgs, $nosubject) = @_;
require PublicInbox::Thread;
my $th = PublicInbox::Thread->new(@$msgs);
- $th->thread;
no warnings 'once';
- $th->order(*PublicInbox::Thread::sort_ts);
+ $Mail::Thread::nosubject = $nosubject;
+ $th->thread;
+ $th->order(*sort_ts);
$th
}
sub _inline_header {
my ($dst, $state, $upfx, $mime, $level) = @_;
- my $pfx = ' ' x $level;
+ my $pfx = INDENT x ($level - 1);
+ my $dot = $level == 0 ? '' : '` ';
my $cur = $state->{cur};
- my $mid = $mime->header('Message-ID');
+ 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';
- my $midc = mid_compress(mid_clean($mid));
+ $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 $midc) {
+ 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;
}
} else {
- $state->{next_msg} ||= $midc;
+ $state->{next_msg} ||= $mid;
}
# Subject is never undef, this mail was loaded from
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";
}
}
$state->{parent} = $mid;
}
_inline_header($dst, $state, $upfx, $mime, $level);
+ } else {
+ 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 sort_ts {
+ sort {
+ (eval { $a->topmost->message->header('X-PI-TS') } || 0) <=>
+ (eval { $b->topmost->message->header('X-PI-TS') } || 0)
+ } @_;
+}
+
+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 {
+ my ($state, $node, $level) = @_;
+ return unless $node;
+ my $child_adjust = 1;
+
+ if (my $x = $node->message) {
+ $x = $x->header_obj;
+ my ($topic, $subj);
+
+ $subj = $x->header('Subject');
+ $subj = $state->{srch}->subject_normalized($subj);
+ $topic = $subj;
+
+ # kill "[PATCH v2]" etc. for summarization
+ $topic =~ s/\A\s*\[[^\]]+\]\s*//g;
+ $topic = substr($topic, 0, 30);
+
+ if (++$state->{subjs}->{$topic} == 1) {
+ push @{$state->{order}}, [ $level, $subj, $topic ];
+ }
+
+ my $mid = mid_clean($x->header('Message-ID'));
+
+ my $u = $x->header('X-PI-From');
+ my $ts = $x->header('X-PI-TS');
+ $state->{latest}->{$topic} = [ $mid, $u, $ts ];
+ } else {
+ # ghost message, do not bump level
+ $child_adjust = 0;
+ }
+
+ add_topic($state, $node->child, $level + $child_adjust);
+ add_topic($state, $node->next, $level);
+}
+
+sub dump_topics {
+ my ($state) = @_;
+ my $order = $state->{order};
+ my $subjs = $state->{subjs};
+ my $latest = $state->{latest};
+ return "\n[No recent topics]</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, $u, $ts) = @{delete $latest->{$topic}};
+ $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 - 1);
+ 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 = "created by $u @ $ts UTC";
+ $n = "\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 = "updated by $u @ $ts UTC";
+ $n = " ($n)\n";
+ }
+ if ($level == 0 || $attr ne $prev_attr) {
+ $pfx .= INDENT if $level > 0;
+ $dst .= "$pfx- ". $attr . $n;
+ $prev_attr = $attr;
+ }
+ }
+ $dst .= '</pre>';
+}
+
+sub emit_index_topics {
+ my ($state, $fh) = @_;
+ my $off = $state->{ctx}->{cgi}->param('o');
+ $off = 0 unless defined $off;
+ $state->{order} = [];
+ $state->{subjs} = {};
+ $state->{latest} = {};
+ my $max = 25;
+ my %opts = ( offset => int $off, limit => $max * 4 );
+ while (scalar @{$state->{order}} < $max) {
+ my $res = $state->{srch}->query('', \%opts);
+ my $nr = scalar @{$res->{msgs}} or last;
+
+ for (rsort_ts(thread_results(load_results($res), 1)->rootset)) {
+ add_topic($state, $_, 0);
+ }
+ $opts{offset} += $nr;
+ }
+
+ $fh->write(dump_topics($state));
+ $opts{offset};
+}
+
1;