X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=db2bd20f3a8e9b8920bb6042ffbeb4c51a97d122;hb=2c69f7bc34a2b12dc7f55e2bb24fa28565f24f03;hp=0b96bda81aab47d5362b8bb60d9cb1b3071b7901;hpb=dfaff07b1578d5b32aae3225cb09c6a3f2177896;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 0b96bda8..db2bd20f 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -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,20 +120,23 @@ sub index_entry { my $dst = _hdr_names($hdr, $f); push @tocc, "$f: $dst" if $dst ne ''; } - my $mapping = $ctx->{mapping}; $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC"; my $upfx = $ctx->{-upfx}; - $rv .= qq{ (permalink / }; - $rv .= qq{raw)\n}; + 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) { - $rv .= qq(In-Reply-To: <$irt>\n) + my $mirt = PublicInbox::Hval->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 @@ -142,7 +146,20 @@ 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"; } @@ -150,7 +167,7 @@ sub pad_link ($$;$) { my ($mid, $level, $s) = @_; $s ||= '...'; my $id = id_compress($mid, 1); - (' 'x19).indent_for($level).th_pfx($level)."($s)\n"; + (' 'x19).indent_for($level).th_pfx($level)."($s)\n"; } sub _th_index_lite { @@ -186,7 +203,7 @@ sub _th_index_lite { 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) { @@ -210,7 +227,8 @@ sub _th_index_lite { $rv .= $pad . $mapping->{$nn->messageid}->[1]; } } - $rv .= "_ $s_s, $s_c\n"; + $rv .= "_ "; + $rv .= "$s_s, $s_c; $ctx->{s_nr}\n"; } sub walk_thread { @@ -237,6 +255,51 @@ sub pre_thread { 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); + my $body = PublicInbox::WwwStream->new($ctx, 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; + }); + [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ]; +} + sub thread_html { my ($ctx) = @_; my $mid = $ctx->{mid}; @@ -244,30 +307,35 @@ 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;
@@ -282,7 +350,7 @@ sub thread_html {
 			return index_entry($mime, $ctx, scalar @$msgs);
 		}
 		$msgs = undef;
-		$skel .= '
';
+		'
'.$skel; }); [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ]; } @@ -434,7 +502,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); @@ -805,7 +873,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"; @@ -846,4 +914,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;