update copyright headers and email addresses

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index b13e5cecdeb79ef0b1861577b886448fec4ccbf2..315d788b8f3a508ed8fb53a03cafe2fdc1ad9812 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 package PublicInbox::Config;
 use strict;
@@ -6,15 +6,34 @@ use warnings;
 use File::Path::Expand qw/expand_filename/;
 
 # returns key-value pairs of config directives in a hash
+# if keys may be multi-value, the value is an array ref containing all values
 sub new {
        my ($class, $file) = @_;
+       my ($in, $out);
 
-       local $ENV{GIT_CONFIG} = defined $file ? $file : default_file();
+       $file = default_file() unless defined($file);
+       my @cmd = (qw/git config/, "--file=$file", '-l');
+       my $cmd = join(' ', @cmd);
+       my $pid = open(my $fh, '-|', @cmd);
+       defined $pid or die "$cmd failed: $!\n";
+       my %rv;
+       foreach my $line (<$fh>) {
+               chomp $line;
+               my ($k, $v) = split(/=/, $line, 2);
+               my $cur = $rv{$k};
 
-       my @cfg = `git config -l`;
-       $? == 0 or die "git config -l failed: $?\n";
-       chomp @cfg;
-       my %rv = map { split(/=/, $_, 2) } @cfg;
+               if (defined $cur) {
+                       if (ref($cur) eq "ARRAY") {
+                               push @$cur, $v;
+                       } else {
+                               $rv{$k} = [ $cur, $v ];
+                       }
+               } else {
+                       $rv{$k} = $v;
+               }
+       }
+       close $fh or die "failed to close ($cmd) pipe: $!\n";
+       $? and warn "$$ $cmd exited with: ($pid) $?\n";
        bless \%rv, $class;
 }
 
@@ -25,16 +44,32 @@ sub lookup {
 
        foreach my $k (keys %$self) {
                $k =~ /\A(publicinbox\.[A-Z0-9a-z-]+)\.address\z/ or next;
-               (lc($self->{$k}) eq $addr) or next;
-               $pfx = $1;
-               last;
+               my $v = $self->{$k};
+               if (ref($v) eq "ARRAY") {
+                       foreach my $alias (@$v) {
+                               (lc($alias) eq $addr) or next;
+                               $pfx = $1;
+                               last;
+                       }
+               } else {
+                       (lc($v) eq $addr) or next;
+                       $pfx = $1;
+                       last;
+               }
        }
 
        defined $pfx or return;
 
-       my %rv = map {
-               $_ => $self->{"$pfx.$_"}
-       } (qw(mainrepo failrepo description address));
+       my %rv;
+       foreach my $k (qw(mainrepo address)) {
+               my $v = $self->{"$pfx.$k"};
+               $rv{$k} = $v if defined $v;
+       }
+       my $listname = $pfx;
+       $listname =~ s/\Apublicinbox\.//;
+       $rv{listname} = $listname;
+       my $v = $rv{address};
+       $rv{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
        \%rv;
 }
 
@@ -47,7 +82,7 @@ sub get {
 sub default_file {
        my $f = $ENV{PI_CONFIG};
        return $f if defined $f;
-       my $pi_dir = $ENV{PI_DIR} || expand_filename('~/.public-inbox/');
+       my $pi_dir = $ENV{PI_DIR} || expand_filename('~/.public-inbox');
        "$pi_dir/config";
 }