X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=d897aeecc3ed3abf6ba2dc71bb9540cbf3ec0bdd;hb=321fcd4881bc196521466c6698f7c4b4a4bb5360;hp=d4bfa62d660e529d04ac12f50db926cf98457263;hpb=4c4de0022f40e09c4db7665cc573a3cb94f753a3;p=public-inbox.git

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index d4bfa62d..d897aeec 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -8,9 +8,10 @@ use strict;
 use warnings;
 use bytes (); # only for bytes::length
 use PublicInbox::MsgTime qw(msg_datestamp);
-use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl);
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl mid_href);
 use PublicInbox::Linkify;
-use PublicInbox::MID qw/id_compress mid_escape mids mids_for_index references/;
+use PublicInbox::MID qw(id_compress mids mids_for_index references
+			$MID_EXTRACT);
 use PublicInbox::MsgIter;
 use PublicInbox::Address;
 use PublicInbox::WwwStream;
@@ -18,7 +19,7 @@ use PublicInbox::Reply;
 use PublicInbox::ViewDiff qw(flush_diff);
 use POSIX qw(strftime);
 use Time::Local qw(timegm);
-use PublicInbox::SearchMsg qw(subject_normalized);
+use PublicInbox::Smsg qw(subject_normalized);
 use constant COLS => 72;
 use constant INDENT => '  ';
 use constant TCHILD => '` ';
@@ -26,22 +27,14 @@ sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD };
 
 sub msg_page_i {
 	my ($nr, $ctx) = @_;
-	my $more = $ctx->{more};
-	if ($nr == 1) {
-		# $more cannot be true w/o $smsg being defined:
-		$ctx->{mhref} = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/'
-				      : '';
-		multipart_text_as_html(delete $ctx->{mime}, $ctx);
-		${delete $ctx->{obuf}} .= '</pre><hr>';
-	} elsif ($more) {
-		++$ctx->{end_nr};
-		# fake an EOF if {more} retrieval fails fails;
-		eval { msg_page_more($ctx, $nr) };
-	} elsif ($nr == $ctx->{end_nr}) {
+	if (my $more = delete $ctx->{more}) { # unlikely
+		# fake an EOF if $more retrieval fails;
+		eval { msg_page_more($ctx, $nr, @$more) };
+	} elsif (my $hdr = delete $ctx->{hdr}) {
 		# fake an EOF if generating the footer fails;
 		# we want to at least show the message if something
 		# here crashes:
-		eval { html_footer($ctx) };
+		eval { html_footer($ctx, $hdr) };
 	} else {
 		undef
 	}
@@ -53,40 +46,37 @@ sub msg_page {
 	my ($ctx) = @_;
 	my $mid = $ctx->{mid};
 	my $ibx = $ctx->{-inbox};
-	my ($first);
-	my $smsg;
+	my ($smsg, $first, $next);
 	if (my $over = $ibx->over) {
 		my ($id, $prev);
-		$smsg = $over->next_by_mid($mid, \$id, \$prev);
-		$first = $ibx->msg_by_smsg($smsg) if $smsg;
-		if ($first) {
-			my $next = $over->next_by_mid($mid, \$id, \$prev);
-			$ctx->{more} = [ $id, $prev, $next ] if $next;
-		}
-		return unless $first;
+		$smsg = $over->next_by_mid($mid, \$id, \$prev) or return;
+		$first = $ibx->msg_by_smsg($smsg) or return;
+		$next = $over->next_by_mid($mid, \$id, \$prev);
+		$ctx->{more} = [ $id, $prev, $next ] if $next;
 	} else {
 		$first = $ibx->msg_by_mid($mid) or return;
 	}
-	my $mime = $ctx->{mime} = PublicInbox::MIME->new($first);
+	my $mime = PublicInbox::MIME->new($first);
 	$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
 	my $hdr = $ctx->{hdr} = $mime->header_obj;
-	_msg_page_prepare_obuf($hdr, $ctx, 0);
-	$ctx->{end_nr} = 2;
+	$ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx, 0);
 	$ctx->{smsg} = $smsg;
+	# $next cannot be true w/o $smsg being defined:
+	$ctx->{mhref} = $next ? '../'.mid_href($smsg->{mid}).'/' : '';
+	multipart_text_as_html($mime, $ctx);
+	$ctx->{-html_tip} = (${delete $ctx->{obuf}} .= '</pre><hr>');
 	PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i);
 }
 
-sub msg_page_more {
-	my ($ctx, $nr) = @_;
-	my ($id, $prev, $smsg) = @{$ctx->{more}};
+sub msg_page_more { # cold
+	my ($ctx, $nr, $id, $prev, $smsg) = @_;
 	my $ibx = $ctx->{-inbox};
-	$smsg = $ibx->smsg_mime($smsg);
 	my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
-	$ctx->{more} = $next ? [ $id, $prev, $next ] : undef;
-	return '' unless $smsg;
-	$ctx->{mhref} = '../' . mid_escape($smsg->{mid}) . '/';
+	$ctx->{more} = [ $id, $prev, $next ] if $next;
+	$smsg = $ibx->smsg_mime($smsg) or return '';
+	$ctx->{mhref} = '../' . mid_href($smsg->{mid}) . '/';
 	my $mime = delete $smsg->{mime};
-	_msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
+	$ctx->{obuf} = _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
 	multipart_text_as_html($mime, $ctx);
 	${delete $ctx->{obuf}} .= '</pre><hr>';
 }
@@ -220,7 +210,7 @@ sub index_entry {
 	obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
 	$rv .= "From: $from @ ".fmt_ts($ds)." UTC";
 	my $upfx = $ctx->{-upfx};
-	my $mhref = $upfx . mid_escape($mid_raw) . '/';
+	my $mhref = $upfx . mid_href($mid_raw) . '/';
 	$rv .= qq{ (<a\nhref="$mhref">permalink</a> / };
 	$rv .= qq{<a\nhref="${mhref}raw">raw</a>)\n};
 	my $to = fold_addresses(_hdr_names_html($hdr, 'To'));
@@ -244,9 +234,8 @@ sub index_entry {
 
 	my $mapping = $ctx->{mapping};
 	if (!$mapping && (defined($irt) || defined($irt = in_reply_to($hdr)))) {
-		my $mirt = PublicInbox::Hval->new_msgid($irt);
-		my $href = $upfx . $mirt->{href}. '/';
-		my $html = $mirt->as_html;
+		my $href = $upfx . mid_href($irt) . '/';
+		my $html = ascii_html($irt);
 		$rv .= qq(In-Reply-To: &lt;<a\nhref="$href">$html</a>&gt;\n)
 	}
 	$rv .= "\n";
@@ -311,7 +300,7 @@ sub _th_index_lite {
 	if (my $smsg = $node->{smsg}) {
 		# delete saves about 200KB on a 1K message thread
 		if (my $refs = delete $smsg->{references}) {
-			($$irt) = ($refs =~ m/<([^>]+)>\z/);
+			($$irt) = ($refs =~ m/$MID_EXTRACT\z/o);
 		}
 	}
 	my $irt_map = $mapping->{$$irt} if defined $$irt;
@@ -529,7 +518,9 @@ sub attach_link ($$$$;$) {
 	my $rv = $ctx->{obuf};
 	$$rv .= qq($nl<a\nhref="$ctx->{mhref}$idx-$sfn">);
 	if ($err) {
-		$$rv .= "[-- Warning: decoded text below may be mangled --]\n";
+		$$rv .= <<EOF;
+[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
+EOF
 	}
 	$$rv .= "[-- Attachment #$idx: ";
 	my $ts = "Type: $ct, Size: $size bytes";
@@ -587,7 +578,7 @@ sub add_text_body { # callback for msg_iter
 	$s .= "\n" unless $s =~ /\n\z/s;
 
 	# split off quoted and unquoted blocks:
-	my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s);
+	my @sections = PublicInbox::MsgIter::split_quotes($s);
 	$s = '';
 	my $rv = $ctx->{obuf};
 	if (defined($fn) || $depth > 0 || $err) {
@@ -631,10 +622,9 @@ sub _msg_page_prepare_obuf {
 	}
 	my @title; # (Subject[0], From[0])
 	for my $v ($hdr->header('From')) {
-		$v = PublicInbox::Hval->new($v);
-		my @n = PublicInbox::Address::names($v->raw);
+		my @n = PublicInbox::Address::names($v);
+		$v = ascii_html($v);
 		$title[1] //= ascii_html(join(', ', @n));
-		$v = $v->as_html;
 		if ($obfs_ibx) {
 			obfuscate_addrs($obfs_ibx, $v);
 			obfuscate_addrs($obfs_ibx, $title[1]);
@@ -672,8 +662,7 @@ sub _msg_page_prepare_obuf {
 	}
 	$ctx->{-title_html} = join(' - ', @title);
 	if (scalar(@$mids) == 1) { # common case
-		my $mid = PublicInbox::Hval->new_msgid($mids->[0]);
-		my $mhtml = $mid->as_html;
+		my $mhtml = ascii_html($mids->[0]);
 		$rv .= "Message-ID: &lt;$mhtml&gt; ";
 		$rv .= "(<a\nhref=\"raw\">raw</a>)\n";
 	} else {
@@ -689,7 +678,7 @@ sub _msg_page_prepare_obuf {
 	}
 	$rv .= _parent_headers($hdr, $over);
 	$rv .= "\n";
-	$ctx->{obuf} = \$rv;
+	\$rv;
 }
 
 sub SKEL_EXPAND () {
@@ -751,9 +740,8 @@ sub _parent_headers {
 		$refs = references($hdr);
 		my $irt = pop @$refs;
 		if (defined $irt) {
-			my $v = PublicInbox::Hval->new_msgid($irt);
-			my $html = $v->as_html;
-			my $href = $v->{href};
+			my $html = ascii_html($irt);
+			my $href = mid_href($irt);
 			$rv .= "In-Reply-To: &lt;";
 			$rv .= "<a\nhref=\"../$href/\">$html</a>&gt;\n";
 		}
@@ -773,9 +761,8 @@ sub _parent_headers {
 
 # returns a string buffer via ->getline
 sub html_footer {
-	my ($ctx) = @_;
+	my ($ctx, $hdr) = @_;
 	my $ibx = $ctx->{-inbox};
-	my $hdr = delete $ctx->{hdr};
 	my $upfx = '../';
 	my $skel = " <a\nhref=\"$upfx\">index</a>";
 	my $rv = '<pre>';
@@ -787,17 +774,17 @@ sub html_footer {
 		$next = $prev = '    ';
 
 		if (my $n = $ctx->{next_msg}) {
-			$n = PublicInbox::Hval->new_msgid($n)->{href};
+			$n = mid_href($n);
 			$next = "<a\nhref=\"$upfx$n/\"\nrel=next>next</a>";
 		}
 		my $u;
 		my $par = $ctx->{parent_msg};
 		if ($par) {
-			$u = PublicInbox::Hval->new_msgid($par)->{href};
+			$u = mid_href($par);
 			$u = "$upfx$u/";
 		}
 		if (my $p = $ctx->{prev_msg}) {
-			$prev = PublicInbox::Hval->new_msgid($p)->{href};
+			$prev = mid_href($p);
 			if ($p && $par && $p eq $par) {
 				$prev = "<a\nhref=\"$upfx$prev/\"\n" .
 					'rel=prev>prev parent</a>';
@@ -819,9 +806,9 @@ sub html_footer {
 }
 
 sub linkify_ref_no_over {
-	my $v = PublicInbox::Hval->new_msgid($_[0]);
-	my $html = $v->as_html;
-	my $href = $v->{href};
+	my ($mid) = @_;
+	my $href = mid_href($mid);
+	my $html = ascii_html($mid);
 	"&lt;<a\nhref=\"../$href/\">$html</a>&gt;";
 }
 
@@ -833,9 +820,8 @@ sub anchor_for {
 sub ghost_parent {
 	my ($upfx, $mid) = @_;
 
-	$mid = PublicInbox::Hval->new_msgid($mid);
-	my $href = $mid->{href};
-	my $html = $mid->as_html;
+	my $href = mid_href($mid);
+	my $html = ascii_html($mid);
 	qq{[parent not found: &lt;<a\nhref="$upfx$href/">$html</a>&gt;]};
 }
 
@@ -996,7 +982,7 @@ sub skel_dump { # walk_thread callback
 		$map->[0] = "$d<a\nhref=\"$m\">$end";
 		$id = "\nid=r".$id;
 	} else {
-		$m = $ctx->{-upfx}.mid_escape($mid).'/';
+		$m = $ctx->{-upfx}.mid_href($mid).'/';
 	}
 	$$skel .=  $d . "<a\nhref=\"$m\"$id>" . $end;
 	1;
@@ -1010,9 +996,8 @@ sub _skel_ghost {
 	$d .= '    '  if exists $ctx->{searchview};
 	$d .= indent_for($level) . th_pfx($level);
 	my $upfx = $ctx->{-upfx};
-	my $m = PublicInbox::Hval->new_msgid($mid);
-	my $href = $upfx . $m->{href} . '/';
-	my $html = $m->as_html;
+	my $href = $upfx . mid_href($mid) . '/';
+	my $html = ascii_html($mid);
 
 	my $mapping = $ctx->{mapping};
 	my $map = $mapping->{$mid} if $mapping;
@@ -1073,7 +1058,7 @@ sub acc_topic { # walk_thread callback
 sub dump_topics {
 	my ($ctx) = @_;
 	my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ]
-	if (!@$order) {
+	unless ($order) {
 		$ctx->{-html_tip} = '<pre>[No topics in range]</pre>';
 		return 404;
 	}
@@ -1088,7 +1073,7 @@ sub dump_topics {
 		@$topic = ();
 		next unless defined $top_subj;  # ghost topic
 		my $mid = delete $seen->{$top_subj};
-		my $href = mid_escape($mid);
+		my $href = mid_href($mid);
 		my $prev_subj = [ split(/ /, $top_subj) ];
 		$top_subj = ascii_html($top_subj);
 		$ds = fmt_ts($ds);
@@ -1118,7 +1103,7 @@ sub dump_topics {
 			$prev_subj = \@next_prev;
 			$subj = ascii_html($subj);
 			obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
-			$href = mid_escape($mid);
+			$href = mid_href($mid);
 			$s .= indent_for($level) . TCHILD;
 			$s .= qq(<a\nhref="$href/T/#u">$subj</a>$omit\n);
 		}