X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=d097d8ab4d86267fc13c52d75fd272b27fcbc289;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=0eb20ae0d7f7f8bc2d1ba103ae70ee151614f72a;hpb=0d41983a642b4dccb90d04c4e2c5e2602885444c;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 0eb20ae0..d097d8ab 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2019 all contributors +# Copyright (C) 2014-2020 all contributors # License: AGPL-3.0+ # # Used for displaying the HTML web interface. @@ -24,18 +24,18 @@ use constant INDENT => ' '; use constant TCHILD => '` '; sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD }; -sub msg_html_i { +sub msg_page_i { my ($nr, $ctx) = @_; my $more = $ctx->{more}; if ($nr == 1) { # $more cannot be true w/o $smsg being defined: my $upfx = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' : ''; - $ctx->{tip} . - multipart_text_as_html(delete $ctx->{mime}, $upfx, - $ctx) . '
' - } elsif ($more && @$more) { + multipart_text_as_html(delete $ctx->{mime}, $upfx, $ctx); + ${delete $ctx->{obuf}} .= '
'; + } elsif ($more) { ++$ctx->{end_nr}; - msg_html_more($ctx, $more, $nr); + # fake an EOF if {more} retrieval fails fails; + eval { msg_page_more($ctx, $nr) }; } elsif ($nr == $ctx->{end_nr}) { # fake an EOF if generating the footer fails; # we want to at least show the message if something @@ -48,24 +48,11 @@ sub msg_html_i { # public functions: (unstable) -sub msg_html { - my ($ctx, $mime, $more, $smsg) = @_; - my $ibx = $ctx->{-inbox}; - $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - my $hdr = $ctx->{hdr} = $mime->header_obj; - $ctx->{tip} = _msg_html_prepare($hdr, $ctx, $more, 0); - $ctx->{more} = $more; - $ctx->{end_nr} = 2; - $ctx->{smsg} = $smsg; - $ctx->{mime} = $mime; - PublicInbox::WwwStream->response($ctx, 200, \&msg_html_i); -} - sub msg_page { my ($ctx) = @_; my $mid = $ctx->{mid}; my $ibx = $ctx->{-inbox}; - my ($first, $more); + my ($first); my $smsg; if (my $over = $ibx->over) { my ($id, $prev); @@ -73,39 +60,34 @@ sub msg_page { $first = $ibx->msg_by_smsg($smsg) if $smsg; if ($first) { my $next = $over->next_by_mid($mid, \$id, \$prev); - $more = [ $id, $prev, $next ] if $next; + $ctx->{more} = [ $id, $prev, $next ] if $next; } return unless $first; } else { $first = $ibx->msg_by_mid($mid) or return; } - msg_html($ctx, PublicInbox::MIME->new($first), $more, $smsg); + my $mime = $ctx->{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->{smsg} = $smsg; + PublicInbox::WwwStream->response($ctx, 200, \&msg_page_i); } -sub msg_html_more { - my ($ctx, $more, $nr) = @_; - my $str = eval { - my ($id, $prev, $smsg) = @$more; - my $mid = $ctx->{mid}; - my $ibx = $ctx->{-inbox}; - $smsg = $ibx->smsg_mime($smsg); - my $next = $ibx->over->next_by_mid($mid, \$id, \$prev); - @$more = $next ? ($id, $prev, $next) : (); - if ($smsg) { - my $upfx = '../' . mid_escape($smsg->mid) . '/'; - my $mime = delete $smsg->{mime}; - _msg_html_prepare($mime->header_obj, $ctx, $more, $nr) . - multipart_text_as_html($mime, $upfx, $ctx) . - '
' - } else { - ''; - } - }; - if ($@) { - warn "Error lookup up additional messages: $@\n"; - $str = '
Error looking up additional messages
'; - } - $str; +sub msg_page_more { + my ($ctx, $nr) = @_; + my ($id, $prev, $smsg) = @{$ctx->{more}}; + 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; + my $upfx = '../' . mid_escape($smsg->mid) . '/'; + my $mime = delete $smsg->{mime}; + _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr); + multipart_text_as_html($mime, $upfx, $ctx); + ${delete $ctx->{obuf}} .= '
'; } # /$INBOX/$MESSAGE_ID/#R @@ -270,9 +252,9 @@ sub index_entry { # scan through all parts, looking for displayable text $ctx->{mhref} = $mhref; - $ctx->{rv} = \$rv; + $ctx->{obuf} = \$rv; msg_iter($mime, \&add_text_body, $ctx, 1); - delete $ctx->{rv}; + delete $ctx->{obuf}; # add the footer $rv .= "\n^ ". @@ -506,23 +488,18 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback sub multipart_text_as_html { my (undef, $mhref, $ctx) = @_; # $mime = $_[0] $ctx->{mhref} = $mhref; - $ctx->{rv} = \(my $rv = ''); # scan through all parts, looking for displayable text msg_iter($_[0], \&add_text_body, $ctx, 1); - ${delete $ctx->{rv}}; } sub flush_quote { my ($s, $l, $quot) = @_; - # show everything in the full version with anchor from - # short version (see above) - my $rv = $l->linkify_1($$quot); + my $rv = $l->to_html($$quot); # we use a here to allow users to specify their own # color for quoted text - $rv = $l->linkify_2(ascii_html($rv)); $$quot = undef; $$s .= qq() . $rv . '' } @@ -549,7 +526,7 @@ sub attach_link ($$$$;$) { } else { $sfn = 'a.bin'; } - my $rv = $ctx->{rv}; + my $rv = $ctx->{obuf}; $$rv .= qq($nl{mhref}$idx-$sfn">); if ($err) { $$rv .= "[-- Warning: decoded text below may be mangled --]\n"; @@ -585,7 +562,7 @@ sub add_text_body { # callback for msg_iter $idx[0] = $upfx . $idx[0] if $upfx ne ''; $ctx->{-apfx} = join('/', @idx); $ctx->{-anchors} = {}; # attr => filename - $ctx->{-diff} = $diff = []; + $diff = 1; delete $ctx->{-long_path}; my $spfx; if ($ibx->{-repo_objs}) { @@ -612,24 +589,21 @@ sub add_text_body { # callback for msg_iter # split off quoted and unquoted blocks: my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s); $s = ''; - my $rv = $ctx->{rv}; + my $rv = $ctx->{obuf}; if (defined($fn) || $depth > 0 || $err) { # badly-encoded message with $err? tell the world about it! attach_link($ctx, $ct, $p, $fn, $err); $$rv .= "\n"; } - my $l = PublicInbox::Linkify->new; + my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new; foreach my $cur (@sections) { if ($cur =~ /\A>/) { flush_quote($rv, $l, \$cur); } elsif ($diff) { - @$diff = split(/^/m, $cur); - $cur = undef; - flush_diff($rv, $ctx, $l); + flush_diff($rv, $ctx, \$cur); } else { # regular lines, OK - $l->linkify_1($cur); - $$rv .= $l->linkify_2(ascii_html($cur)); + $$rv .= $l->to_html($cur); $cur = undef; } } @@ -637,15 +611,14 @@ sub add_text_body { # callback for msg_iter obfuscate_addrs($ibx, $$rv) if $ibx->{obfuscate}; } -sub _msg_html_prepare { - my ($hdr, $ctx, $more, $nr) = @_; - my $atom = ''; +sub _msg_page_prepare_obuf { + my ($hdr, $ctx, $nr) = @_; my $over = $ctx->{-inbox}->over; my $obfs_ibx = $ctx->{-obfs_ibx}; my $rv = ''; my $mids = mids_for_index($hdr); if ($nr == 0) { - if ($more) { + if ($ctx->{more}) { $rv .= "
WARNING: multiple messages have this Message-ID\n
"; } @@ -717,34 +690,37 @@ sub _msg_html_prepare { } $rv .= _parent_headers($hdr, $over); $rv .= "\n"; + $ctx->{obuf} = \$rv; } -sub thread_skel { - my ($skel, $ctx, $hdr, $tpfx) = @_; +sub SKEL_EXPAND () { + qq(expand[flat) . + qq(|nested] ) . + qq(mbox.gz ) . + qq(Atom feed); +} + +sub thread_skel ($$$) { + my ($skel, $ctx, $hdr) = @_; my $mid = mids($hdr)->[0]; my $ibx = $ctx->{-inbox}; my ($nr, $msgs) = $ibx->over->get_thread($mid); - my $expand = qq(expand[flat) . - qq(|nested] ) . - qq(mbox.gz ) . - qq(Atom feed); - my $parent = in_reply_to($hdr); $$skel .= "\nThread overview: "; if ($nr <= 1) { if (defined $parent) { - $$skel .= "$expand\n "; - $$skel .= ghost_parent("$tpfx../", $parent) . "\n"; + $$skel .= SKEL_EXPAND."\n "; + $$skel .= ghost_parent('../', $parent) . "\n"; } else { - $$skel .= "[no followups] $expand\n"; + $$skel .= '[no followups] '.SKEL_EXPAND."\n"; } $ctx->{next_msg} = undef; $ctx->{parent_msg} = $parent; return; } - $$skel .= "$nr+ messages / $expand"; - $$skel .= qq! top\n!; + $$skel .= $nr; + $$skel .= '+ messages / '.SKEL_EXPAND.qq! top\n!; # nb: mutt only shows the first Subject in the index pane # when multiple Subject: headers are present, so we follow suit: @@ -806,7 +782,7 @@ sub html_footer { my $rv = '
';
 	if ($ibx->over) {
 		$skel .= "\n";
-		thread_skel(\$skel, $ctx, $hdr, '');
+		thread_skel(\$skel, $ctx, $hdr);
 		my ($next, $prev);
 		my $parent = '       ';
 		$next = $prev = '    ';