X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=e604aee0d84106d83ce487c119d79e662400c268;hb=02cdbe1c1638ba8e80351b39029c08343fab018b;hp=d8a008c7ffe01bf29862c65a3664e8a04a4b4afc;hpb=53046dfabf5cea98662dc2e2297947be793262ce;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index d8a008c7..e604aee0 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -24,27 +24,23 @@ 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) . '
' . html_footer($hdr, 1, $ctx) . - '' . msg_reply($ctx, $hdr) - }; + eval { html_footer($ctx) }; } else { undef } @@ -52,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); @@ -77,43 +60,38 @@ 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) . - '
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}} .= '
WARNING: multiple messages have this Message-ID\n"; } @@ -720,34 +692,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 ($skel, $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); $$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: @@ -761,7 +736,7 @@ sub thread_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; } @@ -799,17 +774,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 $skel = $standalone ? " index" : ''; - my $irt = ''; - if ($skel && $ibx->over) { + my $skel = " index"; + my $rv = '
'; + if ($ibx->over) { $skel .= "\n"; - thread_skel(\$skel, $ctx, $hdr, $tpfx); + thread_skel(\$skel, $ctx, $hdr); my ($next, $prev); my $parent = ' '; $next = $prev = ' '; @@ -838,13 +813,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 .= $skel; + $rv .= qq(reply); + $rv .= $skel; + $rv .= ''; + $rv .= msg_reply($ctx, $hdr); } sub linkify_ref_no_over { @@ -912,7 +886,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); @@ -949,7 +923,7 @@ 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); @@ -1065,7 +1039,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); @@ -1231,9 +1205,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 {