From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.2 required=3.0 tests=ALL_TRUSTED,BAYES_00,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,
	T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no
	version=3.4.2
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id C0EB91F61F
	for <meta@public-inbox.org>; Sat, 10 Sep 2022 08:18:52 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org;
	s=selector1; t=1662797932;
	bh=tCBIQvj9c8AEu5gGDsXUoVrUzbuVQnnvO0SraVB9ipY=;
	h=From:To:Subject:Date:In-Reply-To:References:From;
	b=K3I/h/gRvqy1927IMZa2ghhVsi5Q2Jq44hdntKpcvJqOIjpd0f6MgqGOsbgjNGwU7
	 ZJ92dGHZPGmmpeRZ6o6kIOOCBCPjPqGw93L/eikXuifG2xFBBGQOPtsOupo7iV9Av+
	 ewkYKUeiSiEadTn8cyqkOHlv8HWft5WYhggn4OR8=
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 06/38] www_text: reduce parameter passing for response header
Date: Sat, 10 Sep 2022 08:16:57 +0000
Message-Id: <20220910081729.2011934-7-e@80x24.org>
In-Reply-To: <20220910081729.2011934-1-e@80x24.org>
References: <20220910081729.2011934-1-e@80x24.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
List-Id: <meta.public-inbox.org>

This is a tiny step in making the code slightly less confusing
by reusing common field names and reducing dependencies on
argument ordering.
---
 lib/PublicInbox/WwwText.pm | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 1a0bb07a..224fed5c 100644
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -31,16 +31,17 @@ sub get_text {
 	my $have_tslash = ($key =~ s!/\z!!) if !$raw;
 
 	my $txt = '';
-	my $hdr = [ 'Content-Type', 'text/plain', 'Content-Length', undef ];
-	if (!_default_text($ctx, $key, $hdr, \$txt)) {
+	if (!_default_text($ctx, $key, \$txt)) {
 		$code = 404;
 		$txt = "404 Not Found ($key)\n";
 	}
 	my $env = $ctx->{env};
 	if ($raw) {
-		$txt = gzf_maybe($hdr, $env)->zflush($txt) if $code == 200;
-		$hdr->[3] = length($txt);
-		return [ $code, $hdr, [ $txt ] ]
+		my $h = delete $ctx->{-res_hdr};
+		$txt = gzf_maybe($h, $env)->zflush($txt) if $code == 200;
+		push @$h, 'Content-Type', 'text/plain',
+			'Content-Length', length($txt);
+		return [ $code, $h, [ $txt ] ]
 	}
 
 	# enforce trailing slash for "wget -r" compatibility
@@ -167,12 +168,13 @@ EOF
 }
 
 # n.b. this is a perfect candidate for memoization
-sub inbox_config ($$$) {
-	my ($ctx, $hdr, $txt) = @_;
+sub inbox_config ($$) {
+	my ($ctx, $txt) = @_;
 	my $ibx = $ctx->{ibx};
-	push @$hdr, 'Content-Disposition', 'inline; filename=inbox.config';
+	push @{$ctx->{-res_hdr}},
+		'Content-Disposition', 'inline; filename=inbox.config';
 	my $t = eval { $ibx->mm->created_at };
-	push(@$hdr, 'Last-Modified', time2str($t)) if $t;
+	push(@{$ctx->{-res_hdr}}, 'Last-Modified', time2str($t)) if $t;
 	my $name = dq_escape($ibx->{name});
 	my $inboxdir = '/path/to/top-level-inbox';
 	my $base_url = $ibx->base_url($ctx->{env});
@@ -219,10 +221,11 @@ EOF
 }
 
 # n.b. this is a perfect candidate for memoization
-sub extindex_config ($$$) {
-	my ($ctx, $hdr, $txt) = @_;
+sub extindex_config ($$) {
+	my ($ctx, $txt) = @_;
 	my $ibx = $ctx->{ibx};
-	push @$hdr, 'Content-Disposition', 'inline; filename=extindex.config';
+	push @{$ctx->{-res_hdr}},
+		'Content-Disposition', 'inline; filename=extindex.config';
 	my $name = dq_escape($ibx->{name});
 	my $base_url = $ibx->base_url($ctx->{env});
 	$$txt .= <<EOS;
@@ -397,16 +400,16 @@ EOF
 	1;
 }
 
-sub _default_text ($$$$) {
-	my ($ctx, $key, $hdr, $txt) = @_;
+sub _default_text ($$$) {
+	my ($ctx, $key, $txt) = @_;
 	if ($key eq 'mirror') {
 		return _mirror_help($ctx, $txt);
 	} elsif ($key eq 'color') {
 		return _colors_help($ctx, $txt);
 	} elsif ($key eq 'config') {
 		return $ctx->{ibx}->can('cloneurl') ?
-			inbox_config($ctx, $hdr, $txt) :
-			extindex_config($ctx, $hdr, $txt);
+			inbox_config($ctx, $txt) :
+			extindex_config($ctx, $txt);
 	}
 	return if $key ne 'help'; # TODO more keys?