X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=8969e17576f60de54152ebb2d4502571610801ef;hb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;hp=98fc133db9b4ed28f16ac8e8ade6c0cd3b236b31;hpb=7ce4210ceb2a150e20e48676d8b635f6d2ed471f;p=public-inbox.git

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 98fc133d..8969e175 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 package PublicInbox::View;
 use strict;
@@ -19,6 +19,7 @@ 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 => '  ';
 
 *ascii_html = *PublicInbox::Hval::ascii_html;
 
@@ -84,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);
@@ -94,14 +95,14 @@ sub index_entry {
 		my $t = $ctx->{flat} ? 'T' : 't';
 		$subj = "<a\nhref=\"${path}$href/$t/#u\">$subj</a>";
 	}
-	if ($root_anchor && $root_anchor eq $id) {
+	if ($root_anchor eq $id) {
 		$subj = "<u\nid=\"u\">$subj</u>";
 	}
 
 	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";
@@ -115,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;
 	}
@@ -132,7 +133,7 @@ sub index_entry {
 
 	if (defined $irt) {
 		unless (defined $parent_anchor) {
-			my $v = PublicInbox::Hval->new_msgid($irt);
+			my $v = PublicInbox::Hval->new_msgid($irt, 1);
 			$v = $v->as_href;
 			$parent_anchor = "${path}$v/";
 		}
@@ -160,11 +161,11 @@ sub thread_html {
 
 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;
-	return missing_thread($cb) if $nr == 0;
+	return missing_thread($cb, $ctx) if $nr == 0;
 	my $flat = $ctx->{flat};
 	my $orig_cb = $cb;
 	my $seen = {};
@@ -189,17 +190,12 @@ sub emit_thread_html {
 
 	# there could be a race due to a message being deleted in git
 	# but still being in the Xapian index:
-	return missing_thread($cb) if ($orig_cb eq $cb);
+	return missing_thread($cb, $ctx) if ($orig_cb eq $cb);
 
 	my $final_anchor = $state->{anchor_idx};
 	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 .
@@ -255,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;
@@ -307,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) {
@@ -341,18 +337,18 @@ 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;
 		"<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;
@@ -382,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
@@ -394,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;
@@ -446,28 +445,33 @@ sub headers_to_html_header {
 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};
 
 	if ($nr <= 1) {
 		$$dst .= "\n[no followups, yet]\n";
-		return;
+		return (undef, in_reply_to($cur));
 	}
 	my $upfx = $full_pfx ? '' : '../';
 
 	$$dst .= "\n\n~$nr messages in thread: ".
 		 "(<a\nhref=\"${upfx}t/#u\">expand</a>)\n";
 	my $subj = $srch->subject_path($cur->header('Subject'));
+	my $parent = in_reply_to($cur);
 	my $state = {
 		seen => { $subj => 1 },
 		srch => $srch,
 		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);
 	}
-	$state->{next_msg};
+	($state->{next_msg}, $state->{parent});
 }
 
 sub _parent_headers_nosrch {
@@ -476,7 +480,7 @@ sub _parent_headers_nosrch {
 
 	my $irt = in_reply_to($header_obj);
 	if (defined $irt) {
-		my $v = PublicInbox::Hval->new_msgid($irt);
+		my $v = PublicInbox::Hval->new_msgid($irt, 1);
 		my $html = $v->as_html;
 		my $href = $v->as_href;
 		$rv .= "In-Reply-To: &lt;";
@@ -493,7 +497,7 @@ sub _parent_headers_nosrch {
 		foreach my $ref (@raw_refs) {
 			next if $seen{$ref};
 			$seen{$ref} = 1;
-			push @refs, linkify_ref($ref);
+			push @refs, linkify_ref_nosrch($ref);
 		}
 
 		if (@refs) {
@@ -536,12 +540,11 @@ sub html_footer {
 	my $upfx = $full_pfx ? '../' : '../../';
 	my $idx = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
 	if ($idx && $srch) {
-		my $next = thread_inline(\$idx, $ctx, $mime, $full_pfx);
-		$irt = in_reply_to($mime->header_obj);
-		if (defined $irt) {
-			$irt = PublicInbox::Hval->new_msgid($irt);
-			$irt = $irt->as_href;
-			$irt = "<a\nhref=\"$upfx$irt/\">parent</a> ";
+		my ($next, $p) = thread_inline(\$idx, $ctx, $mime, $full_pfx);
+		if (defined $p) {
+			$p = PublicInbox::Hval->new_oneline($p);
+			$p = $p->as_href;
+			$irt = "<a\nhref=\"$upfx$p/\">parent</a> ";
 		} else {
 			$irt = ' ' x length('parent ');
 		}
@@ -557,8 +560,8 @@ sub html_footer {
 	"$irt<a\nhref=\"" . ascii_html($href) . '">reply</a>' . $idx;
 }
 
-sub linkify_ref {
-	my $v = PublicInbox::Hval->new_msgid($_[0]);
+sub linkify_ref_nosrch {
+	my $v = PublicInbox::Hval->new_msgid($_[0], 1);
 	my $html = $v->as_html;
 	my $href = $v->as_href;
 	"&lt;<a\nhref=\"../$href/\">$html</a>&gt;";
@@ -588,26 +591,60 @@ 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: &lt;<a\nhref="$upfx../$href/">$html</a>&gt;]};
+}
+
 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);
 }
@@ -625,22 +662,21 @@ 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
 }
 
 sub missing_thread {
-	my ($cb) = @_;
-	my $title = 'Thread does not exist';
-	$cb->([404, ['Content-Type' => 'text/html']])->write(<<EOF);
-<html><head><title>$title</title></head><body><pre>$title
-<a href="../../">Return to index</a></pre></body></html>
-EOF
+	my ($cb, $ctx) = @_;
+	require PublicInbox::ExtMsg;
+
+	$cb->(PublicInbox::ExtMsg::ext_msg($ctx))
 }
 
 sub _msg_date {
@@ -651,27 +687,36 @@ sub _msg_date {
 
 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
@@ -689,22 +734,145 @@ sub _inline_header {
 	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";
 	}
 }
 
 sub inline_dump {
 	my ($dst, $state, $upfx, $node, $level) = @_;
 	return unless $node;
-	return if $state->{stopped};
 	if (my $mime = $node->message) {
+		my $mid = mid_clean($mime->header('Message-ID'));
+		if ($mid eq $state->{parent_cmp}) {
+			$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;