X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=27dd15541a34eed0e4b9c0bd6eaf45f5c8013274;hb=e158d56a54d3c6d4890aa6ac4caa28a834279af0;hp=0b47c899c03735208f56c491163b139975ee4846;hpb=0c28e937c80f3134898bc41f10bc9de350851944;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 0b47c899..27dd1554 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -27,7 +27,7 @@ sub msg_html { my ($ctx, $mime, $footer) = @_; my $hdr = $mime->header_obj; my $tip = _msg_html_prepare($hdr, $ctx); - PublicInbox::WwwStream->new($ctx, sub { + PublicInbox::WwwStream->response($ctx, 200, sub { my ($nr, undef) = @_; if ($nr == 1) { $tip . multipart_text_as_html($mime, '') . @@ -49,7 +49,8 @@ sub msg_html { # /$INBOX/$MESSAGE_ID/#R sub msg_reply { my ($ctx, $hdr) = @_; - my $se_url = 'https://git-htmldocs.bogomips.org/git-send-email.html'; + my $se_url = + 'https://kernel.org/pub/software/scm/git/docs/git-send-email.html'; my ($arg, $link) = mailto_arg_link($hdr); push @$arg, '/path/to/YOUR_REPLY'; @@ -103,7 +104,7 @@ sub index_entry { my $subj = $hdr->header('Subject'); my $mid_raw = mid_clean(mid_mime($mime)); - my $id = id_compress($mid_raw); + my $id = id_compress($mid_raw, 1); my $id_m = 'm'.$id; my $mid = PublicInbox::Hval->new_msgid($mid_raw); @@ -119,13 +120,23 @@ sub index_entry { my $dst = _hdr_names($hdr, $f); push @tocc, "$f: $dst" if $dst ne ''; } - $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC\n"; + $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC"; + my $upfx = $ctx->{-upfx}; + my $mhref = $upfx . $mid->as_href . '/'; + $rv .= qq{ (permalink / }; + $rv .= qq{raw)\n}; $rv .= ' '.join('; +', @tocc) . "\n" if @tocc; + + my $mapping = $ctx->{mapping}; + if (!$mapping && $irt) { + my $mirt = PublicInbox::Hval->new_msgid($irt); + my $href = $upfx . $mirt->as_href . '/'; + my $html = $mirt->as_html; + $rv .= qq(In-Reply-To: <$html>\n) + } $rv .= "\n"; # scan through all parts, looking for displayable text - my $href = $mid->as_href; - my $mhref = $ctx->{-upfx}.$href.'/'; msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) }); # add the footer @@ -135,10 +146,30 @@ sub index_entry { " / reply"; if (my $pct = $ctx->{pct}) { # used by SearchView.pm $rv .= " [relevance $pct->{$mid_raw}%]"; + } elsif ($mapping) { + my $threaded = 'threaded'; + my $flat = 'flat'; + my $end = ''; + if ($ctx->{flat}) { + $flat = "$flat"; + } else { + $threaded = "$threaded"; + } + $rv .= " / [$flat"; + $rv .= "|$threaded]"; + $rv .= " / $ctx->{s_nr}"; } + $rv .= $more ? "\n\n" : "\n"; } +sub pad_link ($$;$) { + my ($mid, $level, $s) = @_; + $s ||= '...'; + my $id = id_compress($mid, 1); + (' 'x19).indent_for($level).th_pfx($level)."($s)\n"; +} + sub _th_index_lite { my ($mid_raw, $irt, $id, $ctx) = @_; my $rv = ''; @@ -148,36 +179,56 @@ sub _th_index_lite { my $map = $mapping->{$mid_raw}; my $nr_c = scalar @{$map->[0]}; my $nr_s = 0; + my $level = $map->[4]; + my $idx = $map->[3]; if (defined $irt) { my $irt_map = $mapping->{$irt}; my $siblings = $irt_map->[0]; $nr_s = scalar(@$siblings) - 1; - $nr_s = 0 if $nr_s < 0; $rv .= $pad . $irt_map->[1]; - my $idx = $map->[3]; if ($idx > 0) { my $prev = $siblings->[$idx - 1]; - $rv .= $pad . $mapping->{$prev->messageid}->[1]; + my $pmid = $prev->messageid; + if ($idx > 2) { + my $s = ($idx - 1). ' preceding siblings ...'; + $rv .= pad_link($pmid, $level, $s); + } elsif ($idx == 2) { + my $ppmid = $siblings->[0]->messageid; + $rv .= $pad . $mapping->{$ppmid}->[1]; + } + $rv .= $pad . $mapping->{$pmid}->[1]; } } my $s_s = nr_to_s($nr_s, 'sibling', 'siblings'); my $s_c = nr_to_s($nr_c, 'reply', 'replies'); my $this = $map->[1]; $this =~ s!\n\z!\n!s; - $this =~ s! !!s; # no point in duplicating subject + $this =~ s! !!s; # no point in duplicating subject $rv .= "@ $this"; my $node = $map->[2]; if (my $child = $node->child) { - $rv .= $pad . $mapping->{$child->messageid}->[1]; + my $cmid = $child->messageid; + $rv .= $pad . $mapping->{$cmid}->[1]; + if ($nr_c > 2) { + my $s = ($nr_c - 1). ' more replies'; + $rv .= pad_link($cmid, $level + 1, $s); + } elsif (my $cn = $child->next) { + $rv .= $pad . $mapping->{$cn->messageid}->[1]; + } } if (my $next = $node->next) { - $rv .= $pad . $mapping->{$next->messageid}->[1]; + my $nmid = $next->messageid; + $rv .= $pad . $mapping->{$nmid}->[1]; + my $nnext = $nr_s - $idx; + if ($nnext > 2) { + my $s = ($nnext - 1).' subsequent siblings'; + $rv .= pad_link($nmid, $level, $s); + } elsif (my $nn = $next->next) { + $rv .= $pad . $mapping->{$nn->messageid}->[1]; + } } - $rv .= ".\t\t\t"; - $rv .= "($s_s, $s_c / "; - my $upfx = $ctx->{-upfx}; - $rv .= qq{permalink / }; - $rv .= qq{raw)\n}; + $rv .= "_ "; + $rv .= "$s_s, $s_c; $ctx->{s_nr}\n"; } sub walk_thread { @@ -200,10 +251,54 @@ sub pre_thread { $idx = scalar @$m; push @$m, $node; } - $mapping->{$node->messageid} = [ [], '', $node, $idx ]; + $mapping->{$node->messageid} = [ [], '', $node, $idx, $level ]; skel_dump($ctx, $level, $node); } +sub thread_index_entry { + my ($ctx, $level, $mime) = @_; + my ($beg, $end) = thread_adj_level($ctx, $level); + $beg . '
' . index_entry($mime, $ctx, 0) . '
' . $end; +} + +sub stream_thread ($$) { + my ($th, $ctx) = @_; + my $inbox = $ctx->{-inbox}; + my $mime; + my @q = map { (0, $_) } $th->rootset; + my $level; + while (@q) { + $level = shift @q; + my $node = shift @q or next; + unshift @q, $level+1, $node->child, $level, $node->next; + $mime = $inbox->msg_by_mid($node->messageid) and last; + } + return missing_thread($ctx) unless $mime; + + $mime = Email::MIME->new($mime); + $ctx->{-title_html} = ascii_html($mime->header('Subject')); + $ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime); + PublicInbox::WwwStream->response($ctx, 200, sub { + return unless $ctx; + while (@q) { + $level = shift @q; + my $node = shift @q or next; + unshift @q, $level+1, $node->child, $level, $node->next; + my $mid = $node->messageid; + if ($mime = $inbox->msg_by_mid($mid)) { + $mime = Email::MIME->new($mime); + return thread_index_entry($ctx, $level, $mime); + } else { + return ghost_index_entry($ctx, $level, $mid); + } + } + my $ret = join('', thread_adj_level($ctx, 0)); + $ret .= ${$ctx->{dst}}; # skel + $ctx = undef; + $ret; + }); +} + sub thread_html { my ($ctx) = @_; my $mid = $ctx->{mid}; @@ -211,34 +306,39 @@ sub thread_html { my $msgs = load_results($sres); my $nr = $sres->{total}; return missing_thread($ctx) if $nr == 0; - my $skel = '
';
+	my $skel = '
';
 	$skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
 	$skel .= ", back to index";
 	$skel .= "\n$nr+ messages in thread: (download: ";
 	$skel .= "mbox.gz";
 	$skel .= " / follow: Atom feed)\n";
+	$ctx->{-upfx} = '../../';
 	$ctx->{cur_level} = 0;
 	$ctx->{dst} = \$skel;
-	$ctx->{mapping} = {}; # mid -> [ reply count, from@date, node ];
 	$ctx->{prev_attr} = '';
 	$ctx->{prev_level} = 0;
 	$ctx->{root_anchor} = anchor_for($mid);
 	$ctx->{seen} = {};
+	$ctx->{mapping} = {};
+	$ctx->{s_nr} = "$nr+ messages in thread";
 
-	walk_thread(thread_results($msgs), $ctx, *pre_thread);
+	my $th = thread_results($msgs);
+	walk_thread($th, $ctx, *pre_thread);
+	$skel .= '
';
+	return stream_thread($th, $ctx) unless $ctx->{flat};
 
-	# lazy load the full message from mini_mime:
+	# flat display: lazy load the full message from mini_mime:
 	my $inbox = $ctx->{-inbox};
 	my $mime;
 	while ($mime = shift @$msgs) {
 		$mime = $inbox->msg_by_mid(mid_clean(mid_mime($mime))) and last;
 	}
+	return missing_thread($ctx) unless $mime;
 	$mime = Email::MIME->new($mime);
-	$ctx->{-upfx} = '../../';
 	$ctx->{-title_html} = ascii_html($mime->header('Subject'));
 	$ctx->{-html_tip} = '
'.index_entry($mime, $ctx, scalar @$msgs);
 	$mime = undef;
-	my $body = PublicInbox::WwwStream->new($ctx, sub {
+	PublicInbox::WwwStream->response($ctx, 200, sub {
 		return unless $msgs;
 		while ($mime = shift @$msgs) {
 			$mid = mid_clean(mid_mime($mime));
@@ -249,9 +349,8 @@ sub thread_html {
 			return index_entry($mime, $ctx, scalar @$msgs);
 		}
 		$msgs = undef;
-		$skel .= '
';
+		'
'.$skel; }); - [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ]; } sub multipart_text_as_html { @@ -401,7 +500,7 @@ sub thread_skel { my $mid = mid_clean($hdr->header_raw('Message-ID')); my $sres = $srch->get_thread($mid); my $nr = $sres->{total}; - my $expand = qq(expand ) . + my $expand = qq(expand ) . qq(/ mbox.gz ) . qq(/ Atom feed); @@ -772,7 +871,7 @@ sub emit_topics { } $subj = PublicInbox::Hval->new($subj)->as_html; - $cur->[1] .= "$subj\n"; + $cur->[1] .= "$subj\n"; $ts = fmt_ts($ts); my $attr = " $ts UTC"; @@ -813,4 +912,34 @@ sub emit_index_topics { $opts{offset}; } +sub thread_adj_level { + my ($ctx, $level) = @_; + + my $max = $ctx->{cur_level}; + if ($level <= 0) { + return ('', '') if $max == 0; # flat output + + # reset existing lists + my $beg = $max > 1 ? ('' x ($max - 1)) : ''; + $ctx->{cur_level} = 0; + ("$beg", ''); + } elsif ($level == $max) { # continue existing list + qw(
    • ); + } elsif ($level < $max) { + my $beg = $max > 1 ? ('' x ($max - $level)) : ''; + $ctx->{cur_level} = $level; + ("$beg
  • ", '
    • '); + } else { # ($level > $max) # start a new level + $ctx->{cur_level} = $level; + my $beg = ($max ? '
  • ' : '') . '
    • '; + ($beg, '
      • '); + } +} + +sub ghost_index_entry { + my ($ctx, $level, $mid) = @_; + my ($beg, $end) = thread_adj_level($ctx, $level); + $beg . '
      '. ghost_parent($ctx->{-upfx}, $mid) . '
      ' . $end; +} + 1;