From 0b766f54ad829d08cc7bd66fffc8ed8515241dc3 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 2 Apr 2016 22:32:01 +0000 Subject: www: various style changes and comment updates Reduce stack depth of arguments and rely more on state hashref to store response state. We may end up shoving everything in ctx eventually. --- lib/PublicInbox/Feed.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/PublicInbox/Feed.pm') diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index ec6925dd..54fa6e5d 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -111,15 +111,15 @@ sub emit_atom_thread { } sub emit_html_index { - my ($cb, $ctx) = @_; - my $fh = $cb->([200,['Content-Type'=>'text/html; charset=UTF-8']]); + my ($res, $ctx) = @_; + my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]); my $max = $ctx->{max} || MAX_PER_PAGE; my $feed_opts = get_feedopts($ctx); my $title = ascii_html($feed_opts->{description} || ''); my ($footer, $param, $last); - my $state = { ctx => $ctx, seen => {}, anchor_idx => 0 }; + my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh }; my $srch = $ctx->{srch}; my $top = "$title (Atom feed)"; @@ -144,10 +144,10 @@ sub emit_html_index { my $cgi = $ctx->{cgi}; if ($cgi && !$cgi->param('r') && $srch) { $state->{srch} = $srch; - $last = PublicInbox::View::emit_index_topics($state, $fh); + $last = PublicInbox::View::emit_index_topics($state); $param = 'o'; } else { - $last = emit_index_nosrch($ctx, $state, $fh); + $last = emit_index_nosrch($ctx, $state); $param = 'r'; } $footer = nav_footer($cgi, $last, $feed_opts, $state, $param); @@ -161,14 +161,14 @@ sub emit_html_index { } sub emit_index_nosrch { - my ($ctx, $state, $fh) = @_; + my ($ctx, $state) = @_; my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir}); my (undef, $last) = each_recent_blob($ctx, sub { my ($path, $commit, $ts, $u, $subj) = @_; $state->{first} ||= $commit; my $mime = do_cat_mail($git, $path) or return 0; - PublicInbox::View::index_entry($fh, $mime, 0, $state); + PublicInbox::View::index_entry($mime, 0, $state); 1; }); Email::Address->purge_cache; -- cgit v1.2.3-24-ge0c7