X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=65788dbebc01717c6ae49db5563996f23855095d;hb=5c5dfb7d5558ff248477fa57aef08e2a8bbd9800;hp=bc4a44323d2aa6a801a3988f4e93199debe3c8f3;hpb=2da0edea03166ba0f90d3168aadfbb78659fbe78;p=public-inbox.git

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index bc4a4432..65788dbe 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -33,8 +33,13 @@ sub msg_html {
 			$tip . multipart_text_as_html($mime, '') .
 				'</pre><hr />'
 		} elsif ($nr == 2) {
-			'<pre>' . html_footer($hdr, 1, $ctx) .
-			'</pre>' . msg_reply($ctx, $hdr);
+			# fake an EOF if generating the footer fails;
+			# we want to at least show the message if something
+			# here crashes:
+			eval {
+				'<pre>' . html_footer($hdr, 1, $ctx) .
+				'</pre>' . msg_reply($ctx, $hdr)
+			};
 		} else {
 			undef
 		}
@@ -44,8 +49,7 @@ sub msg_html {
 # /$INBOX/$MESSAGE_ID/#R
 sub msg_reply {
 	my ($ctx, $hdr) = @_;
-	my $se_url =
-	 'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
+	my $se_url = 'https://git-htmldocs.bogomips.org/git-send-email.html';
 
 	my ($arg, $link) = mailto_arg_link($hdr);
 	push @$arg, '/path/to/YOUR_REPLY';
@@ -79,71 +83,78 @@ sub in_reply_to {
 	undef;
 }
 
+sub _hdr_names ($$) {
+	my ($hdr, $field) = @_;
+	my $val = $hdr->header($field) or return '';
+	ascii_html(join(', ', PublicInbox::Address::names($val)));
+}
+
+sub nr_to_s ($$$) {
+	my ($nr, $singular, $plural) = @_;
+	return "0 $plural" if $nr == 0;
+	$nr == 1 ? "$nr $singular" : "$nr $plural";
+}
+
 # this is already inside a <pre>
 sub index_entry {
 	my ($mime, $level, $state) = @_;
-	my $midx = $state->{anchor_idx}++;
+	$state->{anchor_idx}++;
 	my $ctx = $state->{ctx};
 	my $srch = $ctx->{srch};
 	my $hdr = $mime->header_obj;
 	my $subj = $hdr->header('Subject');
 
 	my $mid_raw = mid_clean(mid_mime($mime));
-	my $id = anchor_for($mid_raw);
-	my $seen = $state->{seen};
-	$seen->{$id} = "#$id"; # save the anchor for children, later
-
+	my $id = id_compress($mid_raw);
+	my $id_m = 'm'.$id;
 	my $mid = PublicInbox::Hval->new_msgid($mid_raw);
-	my $from = PublicInbox::Address::from_name($hdr->header('From'));
 
 	my $root_anchor = $state->{root_anchor} || '';
 	my $path = $root_anchor ? '../../' : '';
 	my $href = $mid->as_href;
 	my $irt = in_reply_to($hdr);
-	my $parent_anchor = $seen->{anchor_for($irt)} if defined $irt;
 
-	$from = ascii_html($from);
-	$subj = ascii_html($subj);
-	$subj = "<a\nhref=\"${path}$href/\">$subj</a>";
-	$subj = "<u\nid=u>$subj</u>" if $root_anchor eq $id;
+	$subj = '<b>'.ascii_html($subj).'</b>';
+	$subj = "<u\nid=u>$subj</u>" if $root_anchor eq $id_m;
 
 	my $ts = _msg_date($hdr);
-	my $rv = "<pre\nid=s$midx>";
-	$rv .= "<b\nid=$id>$subj</b>\n";
-	my $txt = "${path}$href/raw";
-	my $fh = $state->{fh};
-	$fh->write($rv .= "- $from @ $ts UTC (<a\nhref=\"$txt\">raw</a>)\n\n");
-
-	my $mhref = "${path}$href/";
+	my $rv = "<pre><a\nhref=#e$id\nid=$id_m>#</a> ";
+	$rv .= $subj;
+	my $mhref = $path.$href.'/';
+	my $from = _hdr_names($hdr, 'From');
+	$rv .= "\n- $from @ $ts UTC\n";
+	my @tocc;
+	foreach my $f (qw(To Cc)) {
+		my $dst = _hdr_names($hdr, $f);
+		push @tocc, "$f: $dst" if $dst ne '';
+	}
+	$rv .= '  '.join('; +', @tocc) . "\n" if @tocc;
+	$rv .= "\n";
 
 	# scan through all parts, looking for displayable text
-	msg_iter($mime, sub { index_walk($fh, $mhref, $_[0]) });
-	$rv = "\n" . html_footer($hdr, 0, $ctx, "$path$href/#R");
-
+	msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) });
+	$rv .= "\n<a\nhref=\"$mhref\"\n>permalink</a>" .
+		" / <a\nhref=\"${mhref}raw\">raw</a> / ";
+	my $mapping = $state->{mapping};
+	my $nr_c = $mapping->{$mid_raw} || 0;
+	my $nr_s = 0;
 	if (defined $irt) {
-		unless (defined $parent_anchor) {
-			my $v = PublicInbox::Hval->new_msgid($irt, 1);
-			$v = $v->as_href;
-			$parent_anchor = "${path}$v/";
-		}
-		$rv .= " <a\nhref=\"$parent_anchor\">parent</a>";
+		$nr_s = ($mapping->{$irt} || 0) - 1;
+		$nr_s = 0 if $nr_s < 0;
+		$irt = anchor_for($irt);
+		$rv .= "<a\nhref=#$irt>#parent</a>,";
+	} else {
+		$rv .= 'root message:';
 	}
+	$nr_s = nr_to_s($nr_s, 'sibling', 'siblings');
+	$nr_c = nr_to_s($nr_c, 'reply', 'replies');
+	$rv .= " <a\nhref=#r$id\nid=e$id>$nr_s, $nr_c</a>";
+	$rv .= " / <a\nhref=\"${mhref}#R\">reply</a>";
+
 	if (my $pct = $state->{pct}) { # used by SearchView.pm
 		$rv .= " [relevance $pct->{$mid_raw}%]";
-	} elsif ($srch) {
-		my $threaded = 'threaded';
-		my $flat = 'flat';
-		my $end = '';
-		if ($ctx->{flat}) {
-			$flat = "<b>$flat</b>";
-			$end = "\n"; # for lynx
-		} else {
-			$threaded = "<b>$threaded</b>";
-		}
-		$rv .= " [<a\nhref=\"${path}$href/t/#u\">$threaded</a>";
-		$rv .= "|<a\nhref=\"${path}$href/T/#u\">$flat</a>]$end";
 	}
-	$fh->write($rv .= '</pre>');
+	$state->{fh}->write($rv .= "\n</pre>"); # '\n' for lynx
 }
 
 sub thread_html {
@@ -152,69 +163,73 @@ sub thread_html {
 	sub { emit_thread_html($_[0], $ctx, $foot, $srch) }
 }
 
+sub walk_thread {
+	my ($th, $state, $cb) = @_;
+	my @q = map { (0, $_) } $th->rootset;
+	while (@q) {
+		my $level = shift @q;
+		my $node = shift @q or next;
+		$cb->($state, $level, $node);
+		unshift @q, $level+1, $node->child, $level, $node->next;
+	}
+}
+
+sub pre_thread  {
+	my ($state, $level, $node) = @_;
+	my $parent = $node->parent;
+	if ($parent) {
+		my $mid = $parent->messageid;
+		my $m = $state->{mapping};
+		$m->{$mid} ||= 0;
+		$m->{$mid}++;
+	}
+	skel_dump($state, $level, $node);
+}
+
 # only private functions below.
 
 sub emit_thread_html {
 	my ($res, $ctx, $foot, $srch) = @_;
 	my $mid = $ctx->{mid};
-	my $flat = $ctx->{flat};
-	my $msgs = load_results($srch->get_thread($mid, { asc => $flat }));
-	my $nr = scalar @$msgs;
+	my $sres = $srch->get_thread($mid, { asc => 1 });
+	my $msgs = load_results($sres);
+	my $nr = $sres->{total};
 	return missing_thread($res, $ctx) if $nr == 0;
-	my $seen = {};
+	my $skel = '';
 	my $state = {
-		res => $res,
-		ctx => $ctx,
-		seen => $seen,
-		root_anchor => anchor_for($mid),
 		anchor_idx => 0,
+		ctx => $ctx,
 		cur_level => 0,
+		dst => \$skel,
+		mapping => {}, # mid -> reply count
+		prev_attr => '',
+		prev_level => 0,
+		res => $res,
+		root_anchor => anchor_for($mid),
+		seen => {},
+		srch => $ctx->{srch},
+		upfx => '../../',
 	};
 
-	require PublicInbox::Git;
-	$ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
-	if ($flat) {
-		pre_anchor_entry($seen, $_) for (@$msgs);
-		__thread_entry($state, $_, 0) for (@$msgs);
-	} else {
-		my @q = map { (0, $_) } thread_results($msgs)->rootset;
-		while (@q) {
-			my $level = shift @q;
-			my $node = shift @q or next;
-			thread_entry($state, $level, $node);
-			unshift @q, $level+1, $node->child, $level, $node->next;
-		}
-		if (my $max = $state->{cur_level}) {
-			$state->{fh}->write(
-				('</ul></li>' x ($max - 1)) . '</ul>');
-		}
-	}
+	walk_thread(thread_results($msgs), $state, *pre_thread);
+
+	thread_entry($state, $_, 0) for @$msgs;
 
 	# there could be a race due to a message being deleted in git
 	# but still being in the Xapian index:
 	my $fh = delete $state->{fh} or return missing_thread($res, $ctx);
 
-	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>";
-	$next .= "\ndownload thread: ";
+	my $next = @$msgs == 1 ? 'only message in thread' : 'end of thread';
+	$next .= ", back to <a\nhref=\"../../\">index</a>";
+	$next .= "\n<a\nid=t>$nr+ messages in thread:</a> (download: ";
 	$next .= "<a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
-	$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>";
+	$next .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>)\n";
+	$next .= $skel;
 	$fh->write('<hr /><pre>' . $next . "\n\n".
 			$foot .  '</pre></body></html>');
 	$fh->close;
 }
 
-sub index_walk {
-	my ($fh, $upfx, $p) = @_;
-	my $s = add_text_body($upfx, $p);
-
-	return if $s eq '';
-
-	$fh->write($s);
-}
-
 sub multipart_text_as_html {
 	my ($mime, $upfx) = @_;
 	my $rv = "";
@@ -333,8 +348,8 @@ sub _msg_html_prepare {
 		$v = PublicInbox::Hval->new($v);
 
 		if ($h eq 'From') {
-			my $n = PublicInbox::Address::from_name($v->raw);
-			$title[1] = ascii_html($n);
+			my @n = PublicInbox::Address::names($v->raw);
+			$title[1] = ascii_html(join(', ', @n));
 		} elsif ($h eq 'Subject') {
 			$title[0] = $v->as_html;
 			if ($srch) {
@@ -348,6 +363,7 @@ sub _msg_html_prepare {
 		$rv .= "$h: $v\n";
 
 	}
+	$title[0] ||= '(no subject)';
 	$ctx->{-title_html} = join(' - ', @title);
 	$rv .= 'Message-ID: &lt;' . $mid->as_html . '&gt; ';
 	$rv .= "(<a\nhref=\"raw\">raw</a>)\n";
@@ -391,13 +407,7 @@ sub thread_skel {
 		upfx => "$tpfx../",
 		dst => $dst,
 	};
-	my @q = map { (0, $_) } thread_results(load_results($sres))->rootset;
-	while (@q) {
-		my $level = shift @q;
-		my $node = shift @q or next;
-		skel_dump($state, $level, $node);
-		unshift @q, $level+1, $node->child, $level, $node->next;
-	}
+	walk_thread(thread_results(load_results($sres)), $state, *skel_dump);
 	$ctx->{next_msg} = $state->{next_msg};
 	$ctx->{parent_msg} = $parent;
 }
@@ -439,6 +449,15 @@ sub _parent_headers {
 	$rv;
 }
 
+sub squote_maybe ($) {
+	my ($val) = @_;
+	if ($val =~ m{([^\w@\./,\%\+\-])}) {
+		$val =~ s/(['!])/'\\$1'/g; # '!' for csh
+		return "'$val'";
+	}
+	$val;
+}
+
 sub mailto_arg_link {
 	my ($hdr) = @_;
 	my %cc; # everyone else
@@ -459,7 +478,7 @@ sub mailto_arg_link {
 	my $subj = $hdr->header('Subject') || '';
 	$subj = "Re: $subj" unless $subj =~ /\bRe:/i;
 	my $mid = $hdr->header_raw('Message-ID');
-	push @arg, "--in-reply-to='" . ascii_html($mid) . "'";
+	push @arg, '--in-reply-to='.ascii_html(squote_maybe(mid_clean($mid)));
 	my $irt = uri_escape_utf8($mid);
 	delete $cc{$to};
 	push @arg, '--to=' . ascii_html($to);
@@ -471,7 +490,7 @@ sub mailto_arg_link {
 	my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
 	$href =~ s/%20/+/g;
 
-	(\@arg, $href);
+	(\@arg, ascii_html($href));
 }
 
 sub html_footer {
@@ -490,7 +509,7 @@ sub html_footer {
 		if ($p) {
 			$p = PublicInbox::Hval->new_msgid($p);
 			$p = $p->as_href;
-			$irt = "<a\nhref=\"$upfx$p/\"rel=prev>parent</a> ";
+			$irt = "<a\nhref=\"$upfx$p/\"\nrel=prev>parent</a> ";
 		} else {
 			$irt = ' ' x length('parent ');
 		}
@@ -517,11 +536,7 @@ sub linkify_ref_nosrch {
 
 sub anchor_for {
 	my ($msgid) = @_;
-	my $id = $msgid;
-	if ($id !~ /\A[a-f0-9]{40}\z/) {
-		$id = id_compress(mid_clean($id), 1);
-	}
-	'm' . $id;
+	'm' . id_compress($msgid, 1);
 }
 
 sub thread_html_head {
@@ -538,12 +553,6 @@ sub thread_html_head {
 		"</head><body>");
 }
 
-sub pre_anchor_entry {
-	my ($seen, $mime) = @_;
-	my $id = anchor_for(mid_mime($mime));
-	$seen->{$id} = "#$id"; # save the anchor for children, later
-}
-
 sub ghost_parent {
 	my ($upfx, $mid) = @_;
 	# 'subject dummy' is used internally by Mail::Thread
@@ -555,39 +564,7 @@ sub ghost_parent {
 	qq{[parent not found: &lt;<a\nhref="$upfx$href/">$html</a>&gt;]};
 }
 
-sub thread_adj_level {
-	my ($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)) : '';
-		$state->{fh}->write($x . '</ul>');
-		$state->{cur_level} = 0;
-		return '';
-	}
-	if ($level == $max) { # continue existing list
-		$state->{fh}->write('<li>');
-	} elsif ($level < $max) {
-		my $x = $max > 1 ? ('</ul></li>' x ($max - $level)) : '';
-		$state->{fh}->write($x .= '<li>');
-		$state->{cur_level} = $level;
-	} else { # ($level > $max) # start a new level
-		$state->{cur_level} = $level;
-		$state->{fh}->write(($max ? '<li>' : '') . '<ul><li>');
-	}
-	'</li>';
-}
-
-sub ghost_flush {
-	my ($state, $upfx, $mid, $level) = @_;
-	my $end = '<pre>'. ghost_parent($upfx, $mid) . '</pre>';
-	$state->{fh}->write($end .= thread_adj_level($state, $level));
-}
-
-sub __thread_entry {
+sub thread_entry {
 	my ($state, $mime, $level) = @_;
 
 	# lazy load the full message from mini_mime:
@@ -598,16 +575,7 @@ sub __thread_entry {
 	$mime = Email::MIME->new($mime);
 
 	thread_html_head($mime, $state) if $state->{anchor_idx} == 0;
-	if (my $ghost = delete $state->{ghost}) {
-		# n.b. ghost messages may only be parents, not children
-		foreach my $g (@$ghost) {
-			ghost_flush($state, '../../', @$g);
-		}
-	}
-	my $end = thread_adj_level($state, $level);
 	index_entry($mime, $level, $state);
-	$state->{fh}->write($end) if $end;
-
 	1;
 }
 
@@ -616,23 +584,6 @@ sub indent_for {
 	INDENT x ($level - 1);
 }
 
-sub __ghost_prepare {
-	my ($state, $node, $level) = @_;
-	my $ghost = $state->{ghost} ||= [];
-	push @$ghost, [ $node->messageid, $level ];
-}
-
-sub thread_entry {
-	my ($state, $level, $node) = @_;
-	if (my $mime = $node->message) {
-		unless (__thread_entry($state, $mime, $level)) {
-			__ghost_prepare($state, $node, $level);
-		}
-	} else {
-		__ghost_prepare($state, $node, $level);
-	}
-}
-
 sub load_results {
 	my ($sres) = @_;
 
@@ -713,30 +664,44 @@ sub _skel_header {
 		$s = $s->as_html;
 	}
 	my $m = PublicInbox::Hval->new_msgid($mid);
-	$m = $state->{upfx} . $m->as_href . '/';
-	$$dst .= "$pfx<a\nhref=\"$m\">";
+	my $id = '';
+	if ($state->{mapping}) {
+		$id = id_compress($mid, 1);
+		$m = '#m'.$id;
+		$id = "\nid=r".$id;
+	} else {
+		$m = $state->{upfx}.$m->as_href.'/';
+	}
+	$$dst .= "$pfx<a\nhref=\"$m\"$id>";
 	$$dst .= defined($s) ? "$s</a> $f\n" : "$f</a>\n";
 }
 
 sub skel_dump {
 	my ($state, $level, $node) = @_;
 	if (my $mime = $node->message) {
-		my $hdr = $mime->header_obj;
-		my $mid = mid_clean($hdr->header_raw('Message-ID'));
-		_skel_header($state, $hdr, $level);
+		_skel_header($state, $mime->header_obj, $level);
 	} else {
 		my $mid = $node->messageid;
 		my $dst = $state->{dst};
 		if ($mid eq 'subject dummy') {
 			$$dst .= "\t[no common parent]\n";
+			return;
+		}
+		if ($state->{pct}) { # search result
+			$$dst .= '    [irrelevant] ';
 		} else {
 			$$dst .= '     [not found] ';
-			$$dst .= indent_for($level) . th_pfx($level);
-			$mid = PublicInbox::Hval->new_msgid($mid);
-			my $href = $state->{upfx} . $mid->as_href . '/';
-			my $html = $mid->as_html;
-			$$dst .= qq{&lt;<a\nhref="$href">$html</a>&gt;\n};
 		}
+		$$dst .= indent_for($level) . th_pfx($level);
+		my $upfx = $state->{upfx};
+		my $id = '';
+		if ($state->{mapping}) { # thread index view
+			$id = "\nid=".anchor_for($mid);
+		}
+		$mid = PublicInbox::Hval->new_msgid($mid);
+		my $href = $upfx . $mid->as_href . '/';
+		my $html = $mid->as_html;
+		$$dst .= qq{&lt;<a\nhref="$href"$id>$html</a>&gt;\n};
 	}
 }
 
@@ -748,8 +713,7 @@ sub sort_ts {
 }
 
 sub _tryload_ghost ($$) {
-	my ($srch, $node) = @_;
-	my $mid = $node->messageid;
+	my ($srch, $mid) = @_;
 	my $smsg = $srch->lookup_mail($mid) or return;
 	$smsg->mini_mime;
 }
@@ -757,36 +721,27 @@ sub _tryload_ghost ($$) {
 # 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;
+	my ($state, $level, $node) = @_;
 	my $srch = $state->{srch};
-	my $x = $node->message || _tryload_ghost($srch, $node);
+	my $mid = $node->messageid;
+	my $x = $node->message || _tryload_ghost($srch, $mid);
+	my ($subj, $ts);
 	if ($x) {
 		$x = $x->header_obj;
-		my $subj;
-
 		$subj = $x->header('Subject');
 		$subj = $srch->subject_normalized($subj);
-
-		if (++$state->{subjs}->{$subj} == 1) {
-			push @{$state->{order}}, [ $level, $subj ];
-		}
-
-		my $mid = mid_clean($x->header_raw('Message-ID'));
-
-		my $ts = $x->header('X-PI-TS');
-		my $exist = $state->{latest}->{$subj};
-		if (!$exist || $exist->[1] < $ts) {
-			$state->{latest}->{$subj} = [ $mid, $ts ];
-		}
-	} else {
-		# ghost message, do not bump level
-		$child_adjust = 0;
+		$ts = $x->header('X-PI-TS');
+	} else { # ghost message, do not bump level
+		$ts = -666;
+		$subj = "<$mid>";
+	}
+	if (++$state->{subjs}->{$subj} == 1) {
+		push @{$state->{order}}, [ $level, $subj ];
+	}
+	my $exist = $state->{latest}->{$subj};
+	if (!$exist || $exist->[1] < $ts) {
+		$state->{latest}->{$subj} = [ $mid, $ts ];
 	}
-
-	add_topic($state, $node->child, $level + $child_adjust);
-	add_topic($state, $node->next, $level);
 }
 
 sub emit_topics {
@@ -806,7 +761,6 @@ sub emit_topics {
 		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_for($level);
 		my $nl = $level == $prev ? "\n" : '';
 		if ($nl && $cur) {
@@ -815,10 +769,14 @@ sub emit_topics {
 		}
 		$cur ||= [ $ts, '' ];
 		$cur->[0] = $ts if $ts > $cur->[0];
-		$cur->[1] .= $nl . $pfx . th_pfx($level) .
-				"<a\nhref=\"$mid/t/#u\"><b>" .
-				$subj . "</b></a>\n";
+		$cur->[1] .= $nl . $pfx . th_pfx($level);
+		if ($ts == -666) { # ghost
+			$cur->[1] .= ghost_parent('', $mid) . "\n";
+			next; # child will have mbox / atom link
+		}
 
+		$subj = PublicInbox::Hval->new($subj)->as_html;
+		$cur->[1] .= "<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
 		$ts = fmt_ts($ts);
 		my $attr = " $ts UTC";
 
@@ -850,10 +808,8 @@ sub emit_index_topics {
 	while (scalar @{$state->{order}} < $max) {
 		my $sres = $state->{srch}->query('', \%opts);
 		my $nr = scalar @{$sres->{msgs}} or last;
-
-		for (thread_results(load_results($sres))->rootset) {
-			add_topic($state, $_, 0);
-		}
+		$sres = load_results($sres);
+		walk_thread(thread_results($sres), $state, *add_topic);
 		$opts{offset} += $nr;
 	}