From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 7/7] view: common thread walking interface
Date: Tue, 21 Jun 2016 03:12:01 +0000 [thread overview]
Message-ID: <20160621031201.28089-8-e@80x24.org> (raw)
In-Reply-To: <20160621031201.28089-1-e@80x24.org>
Since we have a common pattern, for walking threads,
extract it into a function and reduce the amount of code
we haev.
This will make it easier to switch to an event-driven interface
for getline, too.
---
lib/PublicInbox/SearchView.pm | 8 +-------
lib/PublicInbox/View.pm | 35 ++++++++++++++---------------------
2 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index ba25827..ae875bf 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -172,13 +172,7 @@ sub tdump {
fh => $fh,
};
$ctx->{searchview} = 1;
- my @q = map { (0, $_) } $th->rootset;
- while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- tdump_ent($state, $level, $node);
- unshift @q, $level+1, $node->child, $level, $node->next;
- }
+ PublicInbox::View::walk_thread($th, $state, *tdump_ent);
PublicInbox::View::thread_adj_level($state, 0);
$fh->write(search_nav_bot($mset, $q). "\n\n" .
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 8075e4a..b6fa2a3 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -152,6 +152,17 @@ sub thread_html {
sub { emit_thread_html($_[0], $ctx, $foot, $srch) }
}
+sub walk_thread {
+ my ($th, $state, $cb) = @_;
+ my @q = map { (0, $_) } $th->rootset;
+ while (@q) {
+ my $level = shift @q;
+ my $node = shift @q or next;
+ $cb->($state, $level, $node);
+ unshift @q, $level+1, $node->child, $level, $node->next;
+ }
+}
+
# only private functions below.
sub emit_thread_html {
@@ -177,13 +188,7 @@ sub emit_thread_html {
pre_anchor_entry($seen, $_) for (@$msgs);
__thread_entry($state, $_, 0) for (@$msgs);
} else {
- my @q = map { (0, $_) } thread_results($msgs)->rootset;
- while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- thread_entry($state, $level, $node);
- unshift @q, $level+1, $node->child, $level, $node->next;
- }
+ walk_thread(thread_results($msgs), $state, *thread_entry);
if (my $max = $state->{cur_level}) {
$state->{fh}->write(
('</ul></li>' x ($max - 1)) . '</ul>');
@@ -391,13 +396,7 @@ sub thread_skel {
upfx => "$tpfx../",
dst => $dst,
};
- my @q = map { (0, $_) } thread_results(load_results($sres))->rootset;
- while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- skel_dump($state, $level, $node);
- unshift @q, $level+1, $node->child, $level, $node->next;
- }
+ walk_thread(thread_results(load_results($sres)), $state, *skel_dump);
$ctx->{next_msg} = $state->{next_msg};
$ctx->{parent_msg} = $parent;
}
@@ -847,13 +846,7 @@ sub emit_index_topics {
my $sres = $state->{srch}->query('', \%opts);
my $nr = scalar @{$sres->{msgs}} or last;
$sres = load_results($sres);
- my @q = map { (0, $_) } thread_results($sres)->rootset;
- while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- add_topic($state, $level, $node);
- unshift @q, $level+1, $node->child, $level, $node->next;
- }
+ walk_thread(thread_results($sres), $state, *add_topic);
$opts{offset} += $nr;
}
prev parent reply other threads:[~2016-06-21 3:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-21 3:11 [PATCH 0/7] www: avoid recursion for thread walking Eric Wong
2016-06-21 3:11 ` [PATCH 1/7] view: remove upfx parameter from thread skeleton dump Eric Wong
2016-06-21 3:11 ` [PATCH 2/7] view: remove dst " Eric Wong
2016-06-21 3:11 ` [PATCH 3/7] view: remove recursion " Eric Wong
2016-06-21 3:11 ` [PATCH 4/7] view: remove recursion from expanded thread view Eric Wong
2016-06-21 3:11 ` [PATCH 5/7] searchview: remove recursion from " Eric Wong
2016-06-21 3:12 ` [PATCH 6/7] view: avoid recursion in topic index Eric Wong
2016-06-21 3:12 ` Eric Wong [this message]
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: https://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=20160621031201.28089-8-e@80x24.org \
--to=e@80x24.org \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).