X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=544ded7dd029f8f67e8c47e50e24735ac1c26823;hb=256d049b7ac24f40bb1df691fe014853b75bf491;hp=c38a12894b21dbc8fccd0d9f7f747c57f977ac8f;hpb=9bdd81dc16ba6511eb767bb3c1902bb7cb562ed7;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index c38a1289..544ded7d 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -8,7 +8,7 @@ use strict; use warnings; use bytes (); # only for bytes::length use PublicInbox::MsgTime qw(msg_datestamp); -use PublicInbox::Hval qw/ascii_html obfuscate_addrs/; +use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl); use PublicInbox::Linkify; use PublicInbox::MID qw/id_compress mid_escape mids mids_for_index references/; use PublicInbox::MsgIter; @@ -16,7 +16,7 @@ use PublicInbox::Address; use PublicInbox::WwwStream; use PublicInbox::Reply; use PublicInbox::ViewDiff qw(flush_diff); -require POSIX; +use POSIX qw(strftime); use Time::Local qw(timegm); use PublicInbox::SearchMsg qw(subject_normalized); use constant COLS => 72; @@ -30,21 +30,17 @@ sub msg_html_i { 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($ctx->{mime}, $upfx, $ctx) . - '
' . html_footer($hdr, 1, $ctx) . - '' . msg_reply($ctx, $hdr) - }; + eval { html_footer($ctx) }; } else { undef } @@ -53,11 +49,11 @@ sub msg_html_i { # public functions: (unstable) sub msg_html { - my ($ctx, $mime, $more, $smsg) = @_; + my ($ctx, $mime, $smsg) = @_; my $ibx = $ctx->{-inbox}; $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - $ctx->{tip} = _msg_html_prepare($mime->header_obj, $ctx, $more, 0); - $ctx->{more} = $more; + my $hdr = $ctx->{hdr} = $mime->header_obj; + _msg_html_prepare_obuf($hdr, $ctx, 0); $ctx->{end_nr} = 2; $ctx->{smsg} = $smsg; $ctx->{mime} = $mime; @@ -68,7 +64,7 @@ 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); @@ -76,43 +72,32 @@ 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); + msg_html($ctx, PublicInbox::MIME->new($first), $smsg); } 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 $mime = $smsg->{mime}; - my $upfx = '../' . mid_escape($smsg->mid) . '/'; - _msg_html_prepare($mime->header_obj, $ctx, $more, $nr) . - multipart_text_as_html($mime, $upfx, $ctx) . - '
Error looking up additional messages'; - } - $str; + 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_html_prepare_obuf($mime->header_obj, $ctx, $nr); + multipart_text_as_html($mime, $upfx, $ctx); + ${delete $ctx->{obuf}} .= '
Reply instructions: -You may reply publically to this message via plain-text email using any one of the following methods: @@ -207,6 +192,9 @@ sub nr_to_s ($$$) { $nr == 1 ? "$nr $singular" : "$nr $plural"; } +# human-friendly format +sub fmt_ts ($) { strftime('%Y-%m-%d %k:%M', gmtime($_[0])) } + # this is already inside asub index_entry { my ($smsg, $ctx, $more) = @_; @@ -270,9 +258,9 @@ sub index_entry { # scan through all parts, looking for displayable text $ctx->{mhref} = $mhref; - $ctx->{rv} = \$rv; - msg_iter($mime, \&add_text_body, $ctx); - delete $ctx->{rv}; + $ctx->{obuf} = \$rv; + msg_iter($mime, \&add_text_body, $ctx, 1); + delete $ctx->{obuf}; # add the footer $rv .= "\n^ ". @@ -381,7 +369,8 @@ sub _th_index_lite { $rv .= $pad ."$s_s, $s_c; $ctx->{s_nr}\n"; } -sub walk_thread { +# non-recursive thread walker +sub walk_thread ($$$) { my ($rootset, $ctx, $cb) = @_; my @q = map { (0, $_, -1) } @$rootset; while (@q) { @@ -394,7 +383,7 @@ sub walk_thread { } } -sub pre_thread { +sub pre_thread { # walk_thread callback my ($ctx, $level, $node, $idx) = @_; $ctx->{mapping}->{$node->{id}} = [ '', $node, $idx, $level ]; skel_dump($ctx, $level, $node); @@ -408,7 +397,7 @@ sub thread_index_entry { sub stream_thread_i { # PublicInbox::WwwStream::getline callback my ($nr, $ctx) = @_; - return unless exists($ctx->{dst}); + return unless exists($ctx->{skel}); my $q = $ctx->{-queue}; while (@$q) { my $level = shift @$q; @@ -421,7 +410,7 @@ sub stream_thread_i { # PublicInbox::WwwStream::getline callback return ghost_index_entry($ctx, $level, $node); } } - join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{dst}}; # skel + join('', thread_adj_level($ctx, 0)) . ${delete $ctx->{skel}}; } sub stream_thread ($$) { @@ -445,6 +434,7 @@ sub stream_thread ($$) { PublicInbox::WwwStream->response($ctx, 200, \&stream_thread_i); } +# /$INBOX/$MESSAGE_ID/t/ sub thread_html { my ($ctx) = @_; my $mid = $ctx->{mid}; @@ -461,7 +451,7 @@ sub thread_html { $skel .= "-- links below jump to the message on this page --\n"; $ctx->{-upfx} = '../../'; $ctx->{cur_level} = 0; - $ctx->{dst} = \$skel; + $ctx->{skel} = \$skel; $ctx->{prev_attr} = ''; $ctx->{prev_level} = 0; $ctx->{root_anchor} = anchor_for($mid); @@ -473,7 +463,7 @@ sub thread_html { # reduce hash lookups in pre_thread->skel_dump $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - walk_thread($rootset, $ctx, *pre_thread); + walk_thread($rootset, $ctx, \&pre_thread); $skel .= ''; return stream_thread($rootset, $ctx) unless $ctx->{flat}; @@ -497,18 +487,16 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback $ctx->{-inbox}->smsg_mime($smsg) or next; return index_entry($smsg, $ctx, scalar @$msgs); } - my ($skel) = delete @$ctx{qw(dst msgs)}; + my ($skel) = delete @$ctx{qw(skel msgs)}; $$skel; } sub multipart_text_as_html { - my ($mime, $mhref, $ctx) = @_; + my (undef, $mhref, $ctx) = @_; # $mime = $_[0] $ctx->{mhref} = $mhref; - $ctx->{rv} = \(my $rv = ''); # scan through all parts, looking for displayable text - msg_iter($mime, \&add_text_body, $ctx); - ${delete $ctx->{rv}}; + msg_iter($_[0], \&add_text_body, $ctx, 1); } sub flush_quote { @@ -547,7 +535,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"; @@ -610,7 +598,7 @@ 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); @@ -635,15 +623,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_html_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"; } @@ -715,34 +702,37 @@ sub _msg_html_prepare { } $rv .= _parent_headers($hdr, $over); $rv .= "\n"; + $ctx->{obuf} = \$rv; +} + +sub SKEL_EXPAND () { + qq(expand[flat) . + qq(|nested] ) . + qq(mbox.gz ) . + qq(Atom feed); } -sub thread_skel { - my ($dst, $ctx, $hdr, $tpfx) = @_; +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); - $$dst .= "\nThread overview: "; + $$skel .= "\nThread overview: "; if ($nr <= 1) { if (defined $parent) { - $$dst .= "$expand\n "; - $$dst .= ghost_parent("$tpfx../", $parent) . "\n"; + $$skel .= SKEL_EXPAND."\n "; + $$skel .= ghost_parent('../', $parent) . "\n"; } else { - $$dst .= "[no followups] $expand\n"; + $$skel .= '[no followups] '.SKEL_EXPAND."\n"; } $ctx->{next_msg} = undef; $ctx->{parent_msg} = $parent; return; } - $$dst .= "$nr+ messages / $expand"; - $$dst .= 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: @@ -752,11 +742,11 @@ sub thread_skel { $ctx->{cur} = $mid; $ctx->{prev_attr} = ''; $ctx->{prev_level} = 0; - $ctx->{dst} = $dst; + $ctx->{skel} = $skel; # reduce hash lookups in skel_dump $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef; - walk_thread(thread_results($ctx, $msgs), $ctx, *skel_dump); + walk_thread(thread_results($ctx, $msgs), $ctx, \&skel_dump); $ctx->{parent_msg} = $parent; } @@ -794,17 +784,17 @@ sub _parent_headers { $rv; } +# returns a string buffer via ->getline sub html_footer { - my ($hdr, $standalone, $ctx, $rhref) = @_; - - my $ibx = $ctx->{-inbox} if $ctx; + my ($ctx) = @_; + my $ibx = $ctx->{-inbox}; + my $hdr = delete $ctx->{hdr}; my $upfx = '../'; - my $tpfx = ''; - my $idx = $standalone ? " index" : ''; - my $irt = ''; - if ($idx && $ibx->over) { - $idx .= "\n"; - thread_skel(\$idx, $ctx, $hdr, $tpfx); + my $skel = " index"; + my $rv = ''; + if ($ibx->over) { + $skel .= "\n"; + thread_skel(\$skel, $ctx, $hdr); my ($next, $prev); my $parent = ' '; $next = $prev = ' '; @@ -833,13 +823,12 @@ sub html_footer { } elsif ($u) { # unlikely $parent = " parent"; } - $irt = "$next $prev$parent "; - } else { - $irt = ''; + $rv .= "$next $prev$parent "; } - $rhref ||= '#R'; - $irt .= qq(reply); - $irt .= $idx; + $rv .= qq(reply); + $rv .= $skel; + $rv .= ''; + $rv .= msg_reply($ctx, $hdr); } sub linkify_ref_no_over { @@ -907,7 +896,7 @@ sub thread_results { if (defined($mid) && scalar(@$rootset) > 1) { $ctx->{root_idx} = -1; my $nr = scalar @$msgs; - walk_thread($rootset, $ctx, *find_mid_root); + walk_thread($rootset, $ctx, \&find_mid_root); my $idx = $ctx->{found_mid_at}; if (defined($idx) && $idx != 0) { my $tip = splice(@$rootset, $idx, 1); @@ -925,8 +914,6 @@ sub missing_thread { PublicInbox::ExtMsg::ext_msg($ctx); } -sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) } - sub dedupe_subject { my ($prev_subj, $subj, $val) = @_; @@ -946,16 +933,16 @@ sub dedupe_subject { $omit; } -sub skel_dump { +sub skel_dump { # walk_thread callback my ($ctx, $level, $node) = @_; my $smsg = $node->{smsg} or return _skel_ghost($ctx, $level, $node); - my $dst = $ctx->{dst}; + my $skel = $ctx->{skel}; my $cur = $ctx->{cur}; my $mid = $smsg->{mid}; if ($level == 0 && $ctx->{skel_dump_roots}++) { - $$dst .= delete $ctx->{sl_note} || ''; + $$skel .= delete($ctx->{sl_note}) || ''; } my $f = ascii_html($smsg->from_name); @@ -984,7 +971,7 @@ sub skel_dump { if ($cur) { if ($cur eq $mid) { delete $ctx->{cur}; - $$dst .= "$d". + $$skel .= "$d". "$attr [this message]\n"; return 1; } else { @@ -1024,7 +1011,7 @@ sub skel_dump { } else { $m = $ctx->{-upfx}.mid_escape($mid).'/'; } - $$dst .= $d . "" . $end; + $$skel .= $d . "" . $end; 1; } @@ -1049,8 +1036,7 @@ sub _skel_ghost { } else { $d .= qq{<$html>\n}; } - my $dst = $ctx->{dst}; - $$dst .= $d; + ${$ctx->{skel}} .= $d; 1; } @@ -1063,7 +1049,7 @@ sub sort_ds { # accumulate recent topics if search is supported # returns 200 if done, 404 if not -sub acc_topic { +sub acc_topic { # walk_thread callback my ($ctx, $level, $node) = @_; my $mid = $node->{id}; my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid); @@ -1158,10 +1144,8 @@ sub dump_topics { 200; } -sub ts2str ($) { - my ($ts) = @_; - POSIX::strftime('%Y%m%d%H%M%S', gmtime($ts)); -} +# only for the t= query parameter passed to overview DB +sub ts2str ($) { strftime('%Y%m%d%H%M%S', gmtime($_[0])) }; sub str2ts ($) { my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $_[0]); @@ -1231,9 +1215,9 @@ sub index_topics { my ($ctx) = @_; my $msgs = paginate_recent($ctx, 200); # 200 is our window if (@$msgs) { - walk_thread(thread_results($ctx, $msgs), $ctx, *acc_topic); + walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic); } - PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav); + PublicInbox::WwwStream->response($ctx, dump_topics($ctx), \&index_nav); } sub thread_adj_level {