From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 158D620179 for ; Sat, 18 Jun 2016 04:47:08 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/3] feed: split out top-of-page generation Date: Sat, 18 Jun 2016 04:47:03 +0000 Message-Id: <20160618044705.8337-2-e@80x24.org> In-Reply-To: <20160618044705.8337-1-e@80x24.org> References: <20160618044705.8337-1-e@80x24.org> List-Id: This will eventually allow us to reuse code to generate a common header. --- lib/PublicInbox/Feed.pm | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm index 07774cb..045e495 100644 --- a/lib/PublicInbox/Feed.pm +++ b/lib/PublicInbox/Feed.pm @@ -109,20 +109,11 @@ sub emit_atom_thread { end_feed($fh); } -sub emit_html_index { - my ($res, $ctx) = @_; - my $feed_opts = get_feedopts($ctx); - my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]); - - my $max = $ctx->{max} || MAX_PER_PAGE; +sub _html_index_top { + my ($feed_opts, $srch) = @_; my $title = ascii_html($feed_opts->{description} || ''); - my ($footer, $param, $last); - my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh }; - my $srch = $ctx->{srch}; - my $top = "$title (Atom feed)"; - if ($srch) { $top = qq{
$top} .
 			  qq{ } .
@@ -132,11 +123,24 @@ sub emit_html_index {
 		$top = '
' . $top . "\n";
 	}
 
-	$fh->write("$title" .
-		   "" .
-		   PublicInbox::Hval::STYLE .
-		   "$top");
+	"$title" .
+		"" .
+		PublicInbox::Hval::STYLE .
+		"$top";
+}
+
+sub emit_html_index {
+	my ($res, $ctx) = @_;
+	my $feed_opts = get_feedopts($ctx);
+	my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
+
+	my $max = $ctx->{max} || MAX_PER_PAGE;
+
+	my ($footer, $param, $last);
+	my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh };
+	my $srch = $ctx->{srch};
+	$fh->write(_html_index_top($feed_opts, $srch));
 
 	# if the 'r' query parameter is given, it is a legacy permalink
 	# which we must continue supporting: