X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=895e4f278dfff8b76e1a1e5c5949cf42352c7364;hb=1cf5a6129b5ae4991275862aab539ddea812890a;hp=f7a8ae3289337279c68c1e48e452eb9049be857f;hpb=c2bc9ebcb770a27823d8e989707f434826333b0e;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index f7a8ae32..895e4f27 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -14,9 +14,10 @@ use PublicInbox::MID qw(id_compress mids mids_for_index references $MID_EXTRACT); use PublicInbox::MsgIter; use PublicInbox::Address; -use PublicInbox::WwwStream; +use PublicInbox::WwwStream qw(html_oneshot); use PublicInbox::Reply; use PublicInbox::ViewDiff qw(flush_diff); +use PublicInbox::Eml; use POSIX qw(strftime); use Time::Local qw(timegm); use PublicInbox::Smsg qw(subject_normalized); @@ -26,59 +27,51 @@ use constant TCHILD => '` '; sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD }; sub msg_page_i { - my ($nr, $ctx) = @_; - 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, $hdr) }; - } else { - undef + my ($ctx, $eml) = @_; + if ($eml) { # called by WwwStream::async_eml or getline + my $smsg = $ctx->{smsg}; + $ctx->{smsg} = $ctx->{over}->next_by_mid(@{$ctx->{next_arg}}); + $ctx->{mhref} = ($ctx->{nr} || $ctx->{smsg}) ? + "../${\mid_href($smsg->{mid})}/" : ''; + my $hdr = $eml->header_obj; + my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx); + multipart_text_as_html($eml, $ctx); + delete $ctx->{obuf}; + $$obuf .= '
-sub index_entry { - my ($smsg, $ctx, $more) = @_; - my $subj = $smsg->subject; - my $mid_raw = $smsg->mid; +sub eml_entry { + my ($ctx, $eml, $more) = @_; + my $smsg = delete $ctx->{smsg}; + my $subj = delete $smsg->{subject}; + my $mid_raw = $smsg->{mid}; my $id = id_compress($mid_raw, 1); my $id_m = 'm'.$id; - my $root_anchor = $ctx->{root_anchor} || ''; my $irt; my $obfs_ibx = $ctx->{-obfs_ibx}; @@ -200,12 +194,12 @@ sub index_entry { $rv .= $subj . "\n"; $rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx); my @tocc; - my $ds = $smsg->ds; # for v1 non-Xapian/SQLite users - # deleting {mime} is critical to memory use, - # the rest of the fields saves about 400K as we iterate across 1K msgs - my ($mime) = delete @$smsg{qw(mime ds ts blob subject)}; + my $ds = delete $smsg->{ds}; # for v1 non-Xapian/SQLite users - my $hdr = $mime->header_obj; + # Deleting these fields saves about 400K as we iterate across 1K msgs + delete @$smsg{qw(ts blob)}; + + my $hdr = $eml->header_obj; my $from = _hdr_names_html($hdr, 'From'); obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx; $rv .= "From: $from @ ".fmt_ts($ds)." UTC"; @@ -243,7 +237,7 @@ sub index_entry { # scan through all parts, looking for displayable text $ctx->{mhref} = $mhref; $ctx->{obuf} = \$rv; - msg_iter($mime, \&add_text_body, $ctx, 1); + $eml->each_part(\&add_text_body, $ctx, 1); delete $ctx->{obuf}; # add the footer @@ -371,49 +365,54 @@ sub pre_thread { # walk_thread callback skel_dump($ctx, $level, $node); } -sub thread_index_entry { - my ($ctx, $level, $smsg) = @_; - my ($beg, $end) = thread_adj_level($ctx, $level); - $beg . '' . index_entry($smsg, $ctx, 0) . '' . $end; +sub thread_eml_entry { + my ($ctx, $eml) = @_; + my ($beg, $end) = thread_adj_level($ctx, $ctx->{level}); + $beg . '' . eml_entry($ctx, $eml, 0) . '' . $end; } -sub stream_thread_i { # PublicInbox::WwwStream::getline callback - my ($nr, $ctx) = @_; - return unless exists($ctx->{skel}); - my $q = $ctx->{-queue}; +sub next_in_queue ($$) { + my ($q, $ghost_ok) = @_; while (@$q) { - my $level = shift @$q; - my $node = shift @$q or next; + my ($level, $smsg) = splice(@$q, 0, 2); my $cl = $level + 1; - unshift @$q, map { ($cl, $_) } @{$node->{children}}; - if ($ctx->{-inbox}->smsg_mime($node)) { - return thread_index_entry($ctx, $level, $node); - } else { - return ghost_index_entry($ctx, $level, $node); + unshift @$q, map { ($cl, $_) } @{$smsg->{children}}; + return ($level, $smsg) if $ghost_ok || exists($smsg->{blob}); + } + undef; +} + +sub stream_thread_i { # PublicInbox::WwwStream::getline callback + my ($ctx, $eml) = @_; + goto &thread_eml_entry if $eml; # tail recursion + return unless exists($ctx->{skel}); + my $ghost_ok = $ctx->{nr}++; + while (1) { + my ($lvl, $smsg) = next_in_queue($ctx->{-queue}, $ghost_ok); + if ($smsg) { + if (exists $smsg->{blob}) { # next message for cat-file + $ctx->{level} = $lvl; + if (!$ghost_ok) { # first non-ghost + $ctx->{-title_html} = + ascii_html($smsg->{subject}); + $ctx->zmore($ctx->html_top); + } + return $smsg; + } + # buffer the ghost entry and loop + $ctx->zmore(ghost_index_entry($ctx, $lvl, $smsg)); + } else { # all done + $ctx->zmore(join('', thread_adj_level($ctx, 0))); + $ctx->zmore(${delete($ctx->{skel})}); + return; } } - join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{skel}}; } sub stream_thread ($$) { my ($rootset, $ctx) = @_; - my $ibx = $ctx->{-inbox}; - my @q = map { (0, $_) } @$rootset; - my ($smsg, $level); - while (@q) { - $level = shift @q; - my $node = shift @q or next; - my $cl = $level + 1; - unshift @q, map { ($cl, $_) } @{$node->{children}}; - $smsg = $ibx->smsg_mime($node) and last; - } - return missing_thread($ctx) unless $smsg; - - $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - $ctx->{-title_html} = ascii_html($smsg->{subject}); - $ctx->{-html_tip} = thread_index_entry($ctx, $level, $smsg); - $ctx->{-queue} = \@q; - PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i); + $ctx->{-queue} = [ map { (0, $_) } @$rootset ]; + PublicInbox::WwwStream::aresponse($ctx, 200, \&stream_thread_i); } # /$INBOX/$MESSAGE_ID/t/ @@ -451,40 +450,61 @@ sub thread_html { return stream_thread($rootset, $ctx) unless $ctx->{flat}; # flat display: lazy load the full message from smsg - my $smsg; - while (my $m = shift @$msgs) { - $smsg = $ibx->smsg_mime($m) and last; - } - return missing_thread($ctx) unless $smsg; - $ctx->{-title_html} = ascii_html($smsg->{subject}); - $ctx->{-html_tip} = ''.index_entry($smsg, $ctx, scalar @$msgs); $ctx->{msgs} = $msgs; - PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i); + $ctx->{-html_tip} = ''; + PublicInbox::WwwStream::aresponse($ctx, 200, \&thread_html_i); } sub thread_html_i { # PublicInbox::WwwStream::getline callback - my ($nr, $ctx) = @_; - my $msgs = $ctx->{msgs} or return; - while (my $smsg = shift @$msgs) { - $ctx->{-inbox}->smsg_mime($smsg) or next; - return index_entry($smsg, $ctx, scalar @$msgs); + my ($ctx, $eml) = @_; + if ($eml) { + my $smsg = $ctx->{smsg}; + if (exists $ctx->{-html_tip}) { + $ctx->{-title_html} = ascii_html($smsg->{subject}); + $ctx->zmore($ctx->html_top); + } + return eml_entry($ctx, $eml, scalar @{$ctx->{msgs}}); + } else { + while (my $smsg = shift @{$ctx->{msgs}}) { + return $smsg if exists($smsg->{blob}); + } + my $skel = delete($ctx->{skel}) or return; # all done + $ctx->zmore($$skel); + undef; } - my ($skel) = delete @$ctx{qw(skel msgs)}; - $$skel; } sub multipart_text_as_html { - # ($mime, $ctx) = @_; # msg_iter will do "$_[0] = undef" + # ($mime, $ctx) = @_; # each_part may do "$_[0] = undef" # scan through all parts, looking for displayable text - msg_iter($_[0], \&add_text_body, $_[1], 1); + $_[0]->each_part(\&add_text_body, $_[1], 1); +} + +sub submsg_hdr ($$) { + my ($ctx, $eml) = @_; + my $obfs_ibx = $ctx->{-obfs_ibx}; + my $rv = $ctx->{obuf}; + $$rv .= "\n"; + for my $h (qw(From To Cc Subject Date Message-ID X-Alt-Message-ID)) { + my @v = $eml->header($h); + for my $v (@v) { + obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; + $v = ascii_html($v); + $$rv .= "$h: $v\n"; + } + } } sub attach_link ($$$$;$) { my ($ctx, $ct, $p, $fn, $err) = @_; - my ($part, $depth, @idx) = @$p; - my $nl = $idx[-1] > 1 ? "\n" : ''; - my $idx = join('.', @idx); + my ($part, $depth, $idx) = @$p; + + # Eml iteration clobbers multipart ->{bdy}, so do not offer + # downloads for 0-byte multipart attachments + return unless $part->{bdy}; + + my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...) my $size = bytes::length($part->body); # hide attributes normally, unless we want to aid users in @@ -512,20 +532,30 @@ EOF $desc = ascii_html($desc); $$rv .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]"; $$rv .= "\n"; + + submsg_hdr($ctx, $part) if $part->{is_submsg}; + undef; } -sub add_text_body { # callback for msg_iter +sub add_text_body { # callback for each_part my ($p, $ctx) = @_; my $upfx = $ctx->{mhref}; my $ibx = $ctx->{-inbox}; - # $p - from msg_iter: [ Email::MIME, depth, @idx ] - my ($part, $depth, @idx) = @$p; + my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new; + # $p - from each_part: [ Email::MIME-like, depth, $idx ] + my ($part, $depth, $idx) = @$p; my $ct = $part->content_type || 'text/plain'; my $fn = $part->filename; my ($s, $err) = msg_part_text($part, $ct); return attach_link($ctx, $ct, $p, $fn) unless defined $s; + my $rv = $ctx->{obuf}; + if ($part->{is_submsg}) { + submsg_hdr($ctx, $part); + $$rv .= "\n"; + } + # makes no difference to browsers, and don't screw up filename # link generation in diffs with the extra '%0D' $s =~ s/\r\n/\n/sg; @@ -537,13 +567,14 @@ sub add_text_body { # callback for msg_iter # headers for solver unless some coderepo are configured: my $diff; if ($s =~ /^--- [^\n]+\n\+{3} [^\n]+\n@@ /ms) { - # diffstat anchors do not link across attachments or messages: - $idx[0] = $upfx . $idx[0] if $upfx ne ''; - $ctx->{-apfx} = join('/', @idx); + # diffstat anchors do not link across attachments or messages, + # -apfx is just a stable prefix for making diffstat anchors + # linkable to the first diff hunk w/o crossing attachments + $idx =~ tr!.!/!; # compatibility with previous versions + $ctx->{-apfx} = $upfx . $idx; # do attr => filename mappings for diffstats in git diffs: $ctx->{-anchors} = {} if $s =~ /^diff --git /sm; - $diff = 1; delete $ctx->{-long_path}; my $spfx; @@ -571,13 +602,11 @@ sub add_text_body { # callback for msg_iter # split off quoted and unquoted blocks: my @sections = PublicInbox::MsgIter::split_quotes($s); undef $s; # free memory - my $rv = $ctx->{obuf}; - if (defined($fn) || $depth > 0 || $err) { + if (defined($fn) || ($depth > 0 && !$part->{is_submsg}) || $err) { # badly-encoded message with $err? tell the world about it! attach_link($ctx, $ct, $p, $fn, $err); $$rv .= "\n"; } - my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new; foreach my $cur (@sections) { if ($cur =~ /\A>/) { # we use a here to allow users to specify @@ -596,23 +625,23 @@ sub add_text_body { # callback for msg_iter } sub _msg_page_prepare_obuf { - my ($hdr, $ctx, $nr) = @_; + my ($hdr, $ctx) = @_; my $over = $ctx->{-inbox}->over; my $obfs_ibx = $ctx->{-obfs_ibx}; my $rv = ''; my $mids = mids_for_index($hdr); - if ($nr == 0) { - if ($ctx->{more}) { + my $nr = $ctx->{nr}++; + if ($nr) { # unlikely + $rv .= '
'; + } else { + $ctx->{first_hdr} = $hdr; + if ($ctx->{smsg}) { $rv .= "WARNING: multiple messages have this Message-ID\n"; } $rv .= ""; # anchor for body start - } else { - $rv .= ''; - } - if ($over) { - $ctx->{-upfx} = '../'; } + $ctx->{-upfx} = '../' if $over; my @title; # (Subject[0], From[0]) for my $v ($hdr->header('From')) { my @n = PublicInbox::Address::names($v); @@ -653,7 +682,10 @@ sub _msg_page_prepare_obuf { obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P $rv .= "Date: $v\n"; } - $ctx->{-title_html} = join(' - ', @title); + if (!$nr) { # first (and only) message, common case + $ctx->{-title_html} = join(' - ', @title); + $rv = $ctx->html_top . $rv; + } if (scalar(@$mids) == 1) { # common case my $mhtml = ascii_html($mids->[0]); $rv .= "Message-ID: <$mhtml> "; @@ -1132,11 +1164,6 @@ sub pagination_footer ($$) { "page: $next$prev"; } -sub index_nav { # callback for WwwStream - my (undef, $ctx) = @_; - pagination_footer($ctx, '.') -} - sub paginate_recent ($$) { my ($ctx, $lim) = @_; my $t = $ctx->{qp}->{t} || ''; @@ -1185,7 +1212,8 @@ sub index_topics { if (@$msgs) { walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic); } - PublicInbox::WwwStream->response($ctx, dump_topics($ctx), \&index_nav); + html_oneshot($ctx, dump_topics($ctx), \pagination_footer($ctx, '.')); + } sub thread_adj_level {