user/dev discussion of public-inbox itself
 help / color / Atom feed
* [PATCH] config: boolean handling matches git-config(1)
@ 2019-09-18 19:50 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2019-09-18 19:50 UTC (permalink / raw)
  To: meta

We need to handle arbitrary integers and case-insensitive
variations of human words to match git-config(1) behavior,
since that's what users would expect given we use config
files parseable by git-config(1).
---
 lib/PublicInbox/Config.pm | 17 +++++++++++++----
 t/config.t                | 20 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 01a01c62..ef277c40 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -366,6 +366,17 @@ sub _fill_code_repo {
 	$git;
 }
 
+sub _git_config_bool ($) {
+	my ($val) = @_;
+	if ($val =~ /\A(?:false|no|off|[\-\+]?(?:0x)?0+)\z/i) {
+		0;
+	} elsif ($val =~ /\A(?:true|yes|on|[\-\+]?(?:0x)?[0-9]+)\z/i) {
+		1;
+	} else {
+		undef;
+	}
+}
+
 sub _fill {
 	my ($self, $pfx) = @_;
 	my $ibx = {};
@@ -379,10 +390,8 @@ sub _fill {
 	foreach my $k (qw(obfuscate)) {
 		my $v = $self->{"$pfx.$k"};
 		defined $v or next;
-		if ($v =~ /\A(?:false|no|off|0)\z/) {
-			$ibx->{$k} = 0;
-		} elsif ($v =~ /\A(?:true|yes|on|1)\z/) {
-			$ibx->{$k} = 1;
+		if (defined(my $bval = _git_config_bool($v))) {
+			$ibx->{$k} = $bval;
 		} else {
 			warn "Ignoring $pfx.$k=$v in config, not boolean\n";
 		}
diff --git a/t/config.t b/t/config.t
index b7a4ceb6..a4e76150 100644
--- a/t/config.t
+++ b/t/config.t
@@ -190,4 +190,24 @@ for my $s (@valid) {
 		'inboxes share ::Git object');
 }
 
+{
+	my $check_git = !!$ENV{CHECK_GIT_BOOL};
+	for my $t (qw(TRUE true yes on 1 +1 -1 13 0x1 0x12 0X5)) {
+		is(PublicInbox::Config::_git_config_bool($t), 1, "$t is true");
+		if ($check_git) {
+			is(`git -c test.val=$t config --bool test.val`,
+				"true\n", "$t matches git-config behavior");
+		}
+	}
+	for my $f (qw(FALSE false no off 0 +0 +000 00 0x00 0X0)) {
+		is(PublicInbox::Config::_git_config_bool($f), 0, "$f is false");
+		if ($check_git) {
+			is(`git -c test.val=$f config --bool test.val`,
+				"false\n", "$f matches git-config behavior");
+		}
+	}
+	is(PublicInbox::Config::_git_config_bool('bogus'), undef,
+		'bogus is undef');
+}
+
 done_testing();
-- 
EW


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-18 19:50 [PATCH] config: boolean handling matches git-config(1) Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	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

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.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox