X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=9f87546f9428b680ad90768419700f1f62f70755;hb=aad65bb344ebca758940e1129b5604aba1e20eee;hp=129aa8954c7fb780f32fa5b83ae7741917375f9d;hpb=43238d3688a51d98ce47151173aa7971e231a3bb;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 129aa895..9f87546f 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2014, Eric Wong and all contributors +# Copyright (C) 2014-2015 all contributors # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) package PublicInbox::View; use strict; @@ -85,7 +85,7 @@ sub index_entry { $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 $root_anchor = $state->{root_anchor} || ''; my $path = $root_anchor ? '../../' : ''; my $href = $mid->as_href; my $irt = in_reply_to($header_obj); @@ -95,7 +95,7 @@ sub index_entry { my $t = $ctx->{flat} ? 'T' : 't'; $subj = "$subj"; } - if ($root_anchor && $root_anchor eq $id) { + if ($root_anchor eq $id) { $subj = "$subj"; } @@ -116,8 +116,8 @@ sub index_entry { my ($fhref, $more_ref); my $mhref = "${path}$href/"; - # show full messages at level == 0 in threaded view - if ($level > 0 || ($ctx->{flat} && $root_anchor ne $id)) { + # show full message if it's our root message + if ($root_anchor ne $id) { $fhref = "${path}$href/f/"; $more_ref = \$more; } @@ -196,11 +196,6 @@ sub emit_thread_html { my $next = ""; $next .= $final_anchor == 1 ? 'only message in' : 'end of'; $next .= " thread, back to index"; - if ($flat) { - $next .= " [threaded|flat]"; - } else { - $next .= " [threaded|flat]"; - } $next .= "\ndownload thread: mbox.gz"; $next .= " / follow: Atom feed"; $cb->write("
" . PRE_WRAP . $next . "\n\n". $foot . @@ -256,7 +251,7 @@ sub multipart_text_as_html { # 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; @@ -308,7 +303,7 @@ sub linkify_2 { } 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) { @@ -342,23 +337,23 @@ sub flush_quote { } 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; "" . 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; # account for filter bugs... - if (defined $ct && $ct =~ m!\btext/[xh]+tml\b!i) { + if (defined $ct && $ct =~ m!\btext/x?html\b!i) { $part->body_set(''); return ''; } @@ -383,7 +378,7 @@ sub add_text_body { # 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 @@ -395,7 +390,10 @@ sub add_text_body { 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; @@ -409,7 +407,6 @@ sub headers_to_html_header { my $header_obj = $mime->header_obj; my $mid = $header_obj->header('Message-ID'); $mid = PublicInbox::Hval->new_msgid($mid); - my $mid_href = $mid->as_href; foreach my $h (qw(From To Cc Subject Date)) { my $v = $mime->header($h); defined($v) && ($v ne '') or next; @@ -431,10 +428,10 @@ sub headers_to_html_header { } $rv .= 'Message-ID: <' . $mid->as_html . '> '; - my $raw_ref = $full_pfx ? 'raw' : '../raw'; - $rv .= "(raw)\n"; + my $upfx = $full_pfx ? '' : '../'; + $rv .= "(raw)\n"; if ($srch) { - $rv .= "References: [see below]\n"; + $rv .= "References: [expand]\n"; } else { $rv .= _parent_headers_nosrch($header_obj); } @@ -467,6 +464,8 @@ sub thread_inline { 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); @@ -591,6 +590,17 @@ sub pre_anchor_entry { $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: <$html>]}; +} + sub __thread_entry { my ($cb, $git, $state, $mime, $level) = @_; @@ -607,15 +617,10 @@ sub __thread_entry { if (my $ghost = delete $state->{ghost}) { # n.b. ghost messages may only be parents, not children foreach my $g (@$ghost) { - my $mid = PublicInbox::Hval->new_msgid($g->[0]); - my $pfx = INDENT x $g->[1]; - my $href = $mid->as_href; - my $html = $mid->as_html; - $$cb->write("
$pfx" . - PRE_WRAP . - '[parent not found: <' . - qq{}. - "$html>]
"); + $$cb->write("" . + (INDENT x $g->[1]) . "" . + PRE_WRAP . ghost_parent('../', $g->[0]) . + ''); } } index_entry($$cb, $mime, $level, $state); @@ -656,12 +661,13 @@ sub msg_timestamp { } 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 } @@ -680,21 +686,31 @@ sub _msg_date { 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` ". - "[this message] by $f @ $d\n"; + $$dst .= "$pfx$dot". + "[this message]$attr\n"; return; } @@ -717,10 +733,9 @@ sub _inline_header { my $m = PublicInbox::Hval->new_msgid($mid); $m = $upfx . '../' . $m->as_href . '/'; if (defined $s) { - $$dst .= "$pfx` $s\n" . - "$pfx $f @ $d\n"; + $$dst .= "$pfx$dot$s$attr\n"; } else { - $$dst .= "$pfx` $f @ $d\n"; + $$dst .= "$pfx$dot$f @ $d\n"; } } @@ -734,16 +749,129 @@ sub inline_dump { } _inline_header($dst, $state, $upfx, $mime, $level); } else { - my $pfx = INDENT x $level; - my $v = PublicInbox::Hval->new_msgid($node->messageid, 1); - my $html = $v->as_html; - my $href = $v->as_href; - $$dst .= $pfx . '` [parent not found: <' . - qq{}. - "$html>]\n"; + 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]" 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$subj\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 .= ''; +} + +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;