From: Eric Wong <e@yhbt.net> To: meta@public-inbox.org Subject: [PATCH 07/22] view: simplify duplicate Message-ID handling Date: Sat, 25 Jan 2020 04:44:55 +0000 Message-ID: <20200125044510.13769-8-e@yhbt.net> (raw) In-Reply-To: <20200125044510.13769-1-e@yhbt.net> It's an uncommon code path, no need to make it more complex than it needs to be by having extra sub parameters. --- lib/PublicInbox/View.pm | 55 +++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 8bfa9bec..11767dda 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -33,9 +33,10 @@ sub msg_html_i { $ctx->{tip} . multipart_text_as_html(delete $ctx->{mime}, $upfx, $ctx) . '</pre><hr>' - } elsif ($more && @$more) { + } elsif ($more) { ++$ctx->{end_nr}; - msg_html_more($ctx, $more, $nr); + # fake an EOF if {more} retrieval fails fails; + eval { msg_html_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 @@ -49,12 +50,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; my $hdr = $ctx->{hdr} = $mime->header_obj; - $ctx->{tip} = _msg_html_prepare($hdr, $ctx, $more, 0); - $ctx->{more} = $more; + $ctx->{tip} = _msg_html_prepare($hdr, $ctx, 0); $ctx->{end_nr} = 2; $ctx->{smsg} = $smsg; $ctx->{mime} = $mime; @@ -65,7 +65,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); @@ -73,39 +73,28 @@ 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 $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) . - '</pre><hr>' - } else { - ''; - } - }; - if ($@) { - warn "Error lookup up additional messages: $@\n"; - $str = '<pre>Error looking up additional messages</pre>'; - } - $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($mime->header_obj, $ctx, $nr) . + multipart_text_as_html($mime, $upfx, $ctx) . + '</pre><hr>' } # /$INBOX/$MESSAGE_ID/#R @@ -638,14 +627,14 @@ sub add_text_body { # callback for msg_iter } sub _msg_html_prepare { - my ($hdr, $ctx, $more, $nr) = @_; + my ($hdr, $ctx, $nr) = @_; my $atom = ''; 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 .= "<pre>WARNING: multiple messages have this Message-ID\n</pre>"; }
next prev parent reply other threads:[~2020-01-25 4:45 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-01-25 4:44 [PATCH 00/22] HTML display cleanups, fixes, speedups Eric Wong 2020-01-25 4:44 ` [PATCH 01/22] www*stream: favor \&close instead of *close Eric Wong 2020-01-25 4:44 ` [PATCH 02/22] www: use "skel" terminology consistently Eric Wong 2020-01-25 4:44 ` [PATCH 03/22] view: improve readability around walk_thread Eric Wong 2020-01-25 4:44 ` [PATCH 04/22] searchview: keep $noop sub private to the package Eric Wong 2020-01-25 4:44 ` [PATCH 05/22] view: reduce parameters for html_footer Eric Wong 2020-01-25 4:44 ` [PATCH 06/22] view: thread_skel: drop constant tpfx parameter Eric Wong 2020-01-25 4:44 ` Eric Wong [this message] 2020-01-25 4:44 ` [PATCH 08/22] wwwstream: discard single-use $ctx fields after use Eric Wong 2020-01-25 4:44 ` [PATCH 09/22] view: start performing buffering into {obuf} Eric Wong 2020-01-25 4:44 ` [PATCH 10/22] t/plack.t: modernize and unindent Eric Wong 2020-01-25 4:44 ` [PATCH 11/22] init: use Import::run_die instead of system() Eric Wong 2020-01-25 4:45 ` [PATCH 12/22] tests: move the majority of t/view.t into t/plack.t Eric Wong 2020-01-25 4:45 ` [PATCH 13/22] xt/perf-msgview: switch to multipart_text_as_html Eric Wong 2020-01-25 4:45 ` [PATCH 14/22] view: inline and eliminate msg_html Eric Wong 2020-01-25 4:45 ` [PATCH 15/22] linkify: compile $LINK_RE once Eric Wong 2020-01-25 4:45 ` [PATCH 16/22] linkify: move to_html over from ViewDiff Eric Wong 2020-01-25 4:45 ` [PATCH 17/22] searchidx: skip filenames on "diff --git ..." Eric Wong 2020-01-25 4:45 ` [PATCH 18/22] searchidx: don't assume "a/" and "b/" as prefixes Eric Wong 2020-01-25 4:45 ` [PATCH 19/22] viewdiff: add "b=" param with non-standard diff prefix Eric Wong 2020-01-25 4:45 ` [PATCH 20/22] viewdiff: add "b=" param when missing "diff --git" line Eric Wong 2020-01-25 4:45 ` [PATCH 21/22] viewdiff: use autovivification for long_path hash Eric Wong 2020-01-25 4:45 ` [PATCH 22/22] viewdiff: rewrite and simplify Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200125044510.13769-8-e@yhbt.net \ --to=e@yhbt.net \ --cc=meta@public-inbox.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
user/dev discussion of public-inbox itself This inbox may be cloned and mirrored by anyone: git clone --mirror http://public-inbox.org/meta git clone --mirror http://czquwvybam4bgbro.onion/meta git clone --mirror http://hjrcffqmbrq6wope.onion/meta git clone --mirror http://ou63pmih66umazou.onion/meta # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 meta meta/ http://public-inbox.org/meta \ meta@public-inbox.org public-inbox-index meta Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta nntp://news.gmane.io/gmane.mail.public-inbox.general note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/public-inbox.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git