watch: just use ->urlmatch

We may just modify PublicInbox::Config->urlmatch in the future
to support git <1.8.5, but I wonder if there's enough users on
git <1.8.5 to justify it.

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 8d2dc43268466efc38bea13924171f4e79973c9c..535dadd539c33c051a1b0df379f33faf36d2590c 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -235,11 +235,9 @@ sub imap_section ($) {
        $uri->scheme . '://' . $uri->authority;
 }
 
-sub cfg_intvl ($$$$$) {
-       my ($cfg, $cfg_section, $cfg_key, $imap_section, $url) = @_;
-       my $key = "$cfg_section.$imap_section.$cfg_key";
-       my $v = $cfg->{lc($key)} //
-               $cfg->urlmatch("$cfg_section.$cfg_key", $url) // return;
+sub cfg_intvl ($$$) {
+       my ($cfg, $key, $url) = @_;
+       my $v = $cfg->urlmatch($key, $url) // return;
        $v =~ /\A[0-9]+(?:\.[0-9]+)?\z/s and return $v + 0;
        if (ref($v) eq 'ARRAY') {
                $v = join(', ', @$v);
@@ -257,31 +255,29 @@ sub imap_common_init ($) {
        for my $url (sort keys %{$self->{imap}}) {
                my $uri = PublicInbox::URIimap->new($url);
                my $sec = imap_section($uri);
-               for my $k (qw(Starttls Debug Compress)) {
-                       my $key = lc("imap.$sec.$k");
-                       my $orig = $cfg->{$key} //
-                               $cfg->urlmatch("imap.$k", $url) // next;
+               for my $f (qw(Starttls Debug Compress)) {
+                       my $k = "imap.$f";
+                       my $orig = $cfg->urlmatch($k, $url) // next;
                        my $v = PublicInbox::Config::_git_config_bool($orig);
                        if (defined($v)) {
-                               $mic_args->{$sec}->{$k} = $v;
+                               $mic_args->{$sec}->{$f} = $v;
                        } else {
-                               warn "W: $key=$orig is not boolean\n";
+                               warn "W: $k=$orig for $url is not boolean\n";
                        }
                }
-               my $to = cfg_intvl($cfg, 'imap', 'Timeout', $sec, $url);
+               my $to = cfg_intvl($cfg, 'imap.timeout', $url);
                $mic_args->{$sec}->{Timeout} = $to if $to;
-               $to = cfg_intvl($cfg, 'imap', 'PollInterval', $sec, $url);
+               $to = cfg_intvl($cfg, 'imap.pollInterval', $url);
                $self->{imap_opt}->{$sec}->{poll_intvl} = $to if $to;
-               $to = cfg_intvl($cfg, 'imap', 'IdleInterval', $sec, $url);
+               $to = cfg_intvl($cfg, 'imap.IdleInterval', $url);
                $self->{imap_opt}->{$sec}->{idle_intvl} = $to if $to;
 
-               my $key = lc("imap.$sec.fetchBatchSize");
-               my $bs = $cfg->{lc($key)} //
-                       $cfg->urlmatch('imap.fetchBatchSize', $url) // next;
+               my $k = 'imap.fetchBatchSize';
+               my $bs = $cfg->urlmatch($k, $url) // next;
                if ($bs =~ /\A([0-9]+)\z/) {
                        $self->{imap_opt}->{$sec}->{batch_size} = $bs;
                } else {
-                       warn "W: $key=$bs is not an integer\n";
+                       warn "$k=$bs is not an integer\n";
                }
        }
        $mic_args;

diff --git a/t/imapd.t b/t/imapd.t
index 5626d24765fd79312fc841288a816c06fbe30f6c..cf327e9fbeab42d4917800ee72f2e51403e46459 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -440,9 +440,11 @@ ok($mic->logout, 'logged out');
        like(<$c>, qr/\Atagonly BAD Error in IMAP command/, 'tag-only line');
 }
 
-{
+SKIP: {
        use_ok 'PublicInbox::WatchMaildir';
        use_ok 'PublicInbox::InboxIdle';
+       require_git('1.8.5', 1) or
+               skip('git 1.8.5+ needed for --urlmatch', 4);
        my $old_env = { HOME => $ENV{HOME} };
        my $home = "$tmpdir/watch_home";
        mkdir $home or BAIL_OUT $!;