From: Eric Wong <e@yhbt.net> To: meta@public-inbox.org Subject: [PATCH 02/22] www: use "skel" terminology consistently Date: Sat, 25 Jan 2020 04:44:50 +0000 Message-ID: <20200125044510.13769-3-e@yhbt.net> (raw) In-Reply-To: <20200125044510.13769-1-e@yhbt.net> This saves us a few comments and confusion. Yes, it's a destination so "dst" can be appropriate, but we may be using that term elsewhere. --- lib/PublicInbox/SearchView.pm | 4 +-- lib/PublicInbox/View.pm | 46 +++++++++++++++++------------------ 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm index 0d2e71fd..584b88ed 100644 --- a/lib/PublicInbox/SearchView.pm +++ b/lib/PublicInbox/SearchView.pm @@ -277,7 +277,7 @@ sub mset_thread { $ctx->{-upfx} = ''; $ctx->{anchor_idx} = 1; $ctx->{cur_level} = 0; - $ctx->{dst} = \$skel; + $ctx->{skel} = \$skel; $ctx->{mapping} = {}; $ctx->{searchview} = 1; $ctx->{prev_attr} = ''; @@ -303,7 +303,7 @@ sub mset_thread_i { return PublicInbox::View::index_entry($smsg, $ctx, scalar @$msgs); } - my ($skel) = delete @$ctx{qw(dst msgs)}; + my ($skel) = delete @$ctx{qw(skel msgs)}; $$skel .= "\n</pre>"; } diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index d88b34da..66b9c92c 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -412,7 +412,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; @@ -425,7 +425,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 ($$) { @@ -449,6 +449,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}; @@ -465,7 +466,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); @@ -501,7 +502,7 @@ 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; } @@ -722,7 +723,7 @@ sub _msg_html_prepare { } sub thread_skel { - my ($dst, $ctx, $hdr, $tpfx) = @_; + my ($skel, $ctx, $hdr, $tpfx) = @_; my $mid = mids($hdr)->[0]; my $ibx = $ctx->{-inbox}; my ($nr, $msgs) = $ibx->over->get_thread($mid); @@ -732,21 +733,21 @@ sub thread_skel { qq(<a\nhref="${tpfx}t.atom">Atom feed</a>); my $parent = in_reply_to($hdr); - $$dst .= "\n<b>Thread overview: </b>"; + $$skel .= "\n<b>Thread overview: </b>"; if ($nr <= 1) { if (defined $parent) { - $$dst .= "$expand\n "; - $$dst .= ghost_parent("$tpfx../", $parent) . "\n"; + $$skel .= "$expand\n "; + $$skel .= ghost_parent("$tpfx../", $parent) . "\n"; } else { - $$dst .= "[no followups] $expand\n"; + $$skel .= "[no followups] $expand\n"; } $ctx->{next_msg} = undef; $ctx->{parent_msg} = $parent; return; } - $$dst .= "$nr+ messages / $expand"; - $$dst .= qq! <a\nhref="#b">top</a>\n!; + $$skel .= "$nr+ messages / $expand"; + $$skel .= qq! <a\nhref="#b">top</a>\n!; # nb: mutt only shows the first Subject in the index pane # when multiple Subject: headers are present, so we follow suit: @@ -756,7 +757,7 @@ 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; @@ -804,11 +805,11 @@ sub html_footer { my $ibx = $ctx->{-inbox} if $ctx; my $upfx = '../'; my $tpfx = ''; - my $idx = $standalone ? " <a\nhref=\"$upfx\">index</a>" : ''; + my $skel = $standalone ? " <a\nhref=\"$upfx\">index</a>" : ''; my $irt = ''; - if ($idx && $ibx->over) { - $idx .= "\n"; - thread_skel(\$idx, $ctx, $hdr, $tpfx); + if ($skel && $ibx->over) { + $skel .= "\n"; + thread_skel(\$skel, $ctx, $hdr, $tpfx); my ($next, $prev); my $parent = ' '; $next = $prev = ' '; @@ -843,7 +844,7 @@ sub html_footer { } $rhref ||= '#R'; $irt .= qq(<a\nhref="$rhref">reply</a>); - $irt .= $idx; + $irt .= $skel; } sub linkify_ref_no_over { @@ -952,12 +953,12 @@ sub skel_dump { 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); @@ -986,7 +987,7 @@ sub skel_dump { if ($cur) { if ($cur eq $mid) { delete $ctx->{cur}; - $$dst .= "<b>$d<a\nid=r\nhref=\"#t\">". + $$skel .= "<b>$d<a\nid=r\nhref=\"#t\">". "$attr [this message]</a></b>\n"; return 1; } else { @@ -1026,7 +1027,7 @@ sub skel_dump { } else { $m = $ctx->{-upfx}.mid_escape($mid).'/'; } - $$dst .= $d . "<a\nhref=\"$m\"$id>" . $end; + $$skel .= $d . "<a\nhref=\"$m\"$id>" . $end; 1; } @@ -1051,8 +1052,7 @@ sub _skel_ghost { } else { $d .= qq{<<a\nhref="$href">$html</a>>\n}; } - my $dst = $ctx->{dst}; - $$dst .= $d; + ${$ctx->{skel}} .= $d; 1; }
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 ` Eric Wong [this message] 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 ` [PATCH 07/22] view: simplify duplicate Message-ID handling Eric Wong 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-3-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