X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FConfig.pm;h=ae9ad8deef9e910bd89c35388278522b388e47aa;hb=08338456f0770a64abb04a8648a77b3742a06b6a;hp=c18c9c75b4ffee3a1fb865ca04d8ce6eda01d330;hpb=48180dbb004b5f59b2e80613b6fa2e5e869316f1;p=public-inbox.git

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index c18c9c75..ae9ad8de 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -9,7 +9,7 @@
 
 package PublicInbox::Config;
 use strict;
-use warnings;
+use v5.10.1;
 use PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
 
@@ -19,7 +19,7 @@ sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
 # if keys may be multi-value, the value is an array ref containing all values
 sub new {
 	my ($class, $file) = @_;
-	$file = default_file() unless defined($file);
+	$file //= default_file();
 	my $self;
 	if (ref($file) eq 'SCALAR') { # used by some tests
 		open my $fh, '<', $file or die;  # PerlIO::scalar
@@ -105,13 +105,16 @@ sub iterate_start {
 	$self->{-iter} = [ \$i, $cb, $arg ];
 }
 
-# for PublicInbox::DS::next_tick
+# for PublicInbox::DS::next_tick, we only call this is if
+# PublicInbox::DS is already loaded
 sub event_step {
 	my ($self) = @_;
 	my ($i, $cb, $arg) = @{$self->{-iter}};
 	my $section = $self->{-section_order}->[$$i++];
 	delete($self->{-iter}) unless defined($section);
-	$cb->($self, $section, $arg);
+	eval { $cb->($self, $section, $arg) };
+	warn "E: $@ in ${self}::event_step" if $@;
+	PublicInbox::DS::requeue($self) if defined($section);
 }
 
 sub lookup_newsgroup {
@@ -133,9 +136,7 @@ sub limiter {
 sub config_dir { $ENV{PI_DIR} // "$ENV{HOME}/.public-inbox" }
 
 sub default_file {
-	my $f = $ENV{PI_CONFIG};
-	return $f if defined $f;
-	config_dir() . '/config';
+	$ENV{PI_CONFIG} // (config_dir() . '/config');
 }
 
 sub config_fh_parse ($$$) {
@@ -366,8 +367,8 @@ sub _fill_code_repo {
 	$git;
 }
 
-sub _git_config_bool ($) {
-	my ($val) = @_;
+sub git_bool {
+	my ($val) = $_[-1]; # $_[0] may be $self, or $val
 	if ($val =~ /\A(?:false|no|off|[\-\+]?(?:0x)?0+)\z/i) {
 		0;
 	} elsif ($val =~ /\A(?:true|yes|on|[\-\+]?(?:0x)?[0-9]+)\z/i) {
@@ -383,18 +384,22 @@ sub _fill {
 
 	foreach my $k (qw(inboxdir filter newsgroup
 			watch httpbackendmax
-			replyto feedmax nntpserver indexlevel)) {
+			replyto feedmax nntpserver
+			indexlevel indexsequentialshard)) {
 		my $v = $self->{"$pfx.$k"};
 		$ibx->{$k} = $v if defined $v;
 	}
 
 	# backwards compatibility:
 	$ibx->{inboxdir} //= $self->{"$pfx.mainrepo"};
-
+	if (($ibx->{inboxdir} // '') =~ /\n/s) {
+		warn "E: `$ibx->{inboxdir}' must not contain `\\n'\n";
+		return;
+	}
 	foreach my $k (qw(obfuscate)) {
 		my $v = $self->{"$pfx.$k"};
 		defined $v or next;
-		if (defined(my $bval = _git_config_bool($v))) {
+		if (defined(my $bval = git_bool($v))) {
 			$ibx->{$k} = $bval;
 		} else {
 			warn "Ignoring $pfx.$k=$v in config, not boolean\n";
@@ -459,4 +464,23 @@ sub _fill {
 	$ibx
 }
 
+sub urlmatch {
+	my ($self, $key, $url) = @_;
+	state $urlmatch_broken; # requires git 1.8.5
+	return if $urlmatch_broken;
+	my $file = default_file();
+	my $cmd = [qw/git config -z --includes --get-urlmatch/,
+		"--file=$file", $key, $url ];
+	my $fh = popen_rd($cmd);
+	local $/ = "\0";
+	my $val = <$fh>;
+	if (close($fh)) {
+		chomp($val);
+		$val;
+	} else {
+		$urlmatch_broken = 1 if (($? >> 8) != 1);
+		undef;
+	}
+}
+
 1;