wwwstream: use parent.pm and no warnings

[public-inbox.git] / lib / PublicInbox / Config.pm

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index e0ca7c5a0d643e07826d7f8a58ab479d6835e817..c0e2cc575ec640ff1532edcc16d501660e5e4f28 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used throughout the project for reading configuration
@@ -9,7 +9,7 @@
 
 package PublicInbox::Config;
 use strict;
-use warnings;
+use v5.10.1;
 use PublicInbox::Inbox;
 use PublicInbox::Spawn qw(popen_rd);
 
@@ -99,6 +99,24 @@ sub each_inbox {
        }
 }
 
+sub iterate_start {
+       my ($self, $cb, $arg) = @_;
+       my $i = 0;
+       $self->{-iter} = [ \$i, $cb, $arg ];
+}
+
+# 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);
+       eval { $cb->($self, $section, $arg) };
+       warn "E: $@ in ${self}::event_step" if $@;
+       PublicInbox::DS::requeue($self) if defined($section);
+}
+
 sub lookup_newsgroup {
        my ($self, $ng) = @_;
        _lookup_fill($self, '-by_newsgroup', lc($ng));
@@ -156,7 +174,7 @@ sub config_fh_parse ($$$) {
 sub git_config_dump {
        my ($file) = @_;
        return {} unless -e $file;
-       my @cmd = (qw/git config -z -l/, "--file=$file");
+       my @cmd = (qw/git config -z -l --includes/, "--file=$file");
        my $cmd = join(' ', @cmd);
        my $fh = popen_rd(\@cmd);
        my $rv = config_fh_parse($fh, "\0", "\n");
@@ -367,7 +385,7 @@ sub _fill {
        my $ibx = {};
 
        foreach my $k (qw(inboxdir filter newsgroup
-                       watch watchheader httpbackendmax
+                       watch httpbackendmax
                        replyto feedmax nntpserver indexlevel)) {
                my $v = $self->{"$pfx.$k"};
                $ibx->{$k} = $v if defined $v;
@@ -388,7 +406,7 @@ sub _fill {
        # TODO: more arrays, we should support multi-value for
        # more things to encourage decentralization
        foreach my $k (qw(address altid nntpmirror coderepo hide listid url
-                       infourl)) {
+                       infourl watchheader)) {
                if (defined(my $v = $self->{"$pfx.$k"})) {
                        $ibx->{$k} = _array($v);
                }
@@ -444,4 +462,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;