imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 74a1a6f5a776fd388bed0b9a16b53263f914e03e..a31b5b74c7c7282ba1e3bb83e7fcc6603b7427bb 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) 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
@@ -19,7 +19,7 @@ sub _array ($) { ref($_[0]) eq 'ARRAY' ? $_[0] : [ $_[0] ] }
 # 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 ($class, $file, $errfh) = @_;
        $file //= default_file();
        my $self;
        if (ref($file) eq 'SCALAR') { # used by some tests
@@ -27,7 +27,7 @@ sub new {
                $self = config_fh_parse($fh, "\n", '=');
                bless $self, $class;
        } else {
-               $self = git_config_dump($class, $file);
+               $self = git_config_dump($class, $file, $errfh);
                $self->{'-f'} = $file;
        }
        # caches
@@ -323,35 +323,18 @@ sub parse_cgitrc {
        cgit_repo_merge($self, $repo->{dir}, $repo) if $repo;
 }
 
-# parse a code repo
-# Only git is supported at the moment, but SVN and Hg are possibilities
-sub _fill_code_repo {
+# parse a code repo, only git is supported at the moment
+sub fill_code_repo {
        my ($self, $nick) = @_;
        my $pfx = "coderepo.$nick";
-
-       my $dir = $self->{"$pfx.dir"}; # aka "GIT_DIR"
-       unless (defined $dir) {
+       my $dir = $self->{"$pfx.dir"} // do { # aka "GIT_DIR"
                warn "$pfx.dir unset\n";
                return;
-       }
-
+       };
        my $git = PublicInbox::Git->new($dir);
-       foreach my $t (qw(blob commit tree tag)) {
-               $git->{$t.'_url_format'} =
-                               _array($self->{lc("$pfx.${t}UrlFormat")});
-       }
-
        if (defined(my $cgits = $self->{"$pfx.cgiturl"})) {
                $git->{cgit_url} = $cgits = _array($cgits);
                $self->{"$pfx.cgiturl"} = $cgits;
-
-               # cgit supports "/blob/?id=%s", but it's only a plain-text
-               # display and requires an unabbreviated id=
-               foreach my $t (qw(blob commit tag)) {
-                       $git->{$t.'_url_format'} //= map {
-                               "$_/$t/?id=%s"
-                       } @$cgits;
-               }
        }
 
        $git;
@@ -385,17 +368,17 @@ sub rel2abs_collapsed {
 }
 
 sub get_1 {
-       my ($self, $pfx, $k) = @_;
-       my $v = $self->{"$pfx.$k"} // return;
+       my ($self, $key) = @_;
+       my $v = $self->{$key};
        return $v if !ref($v);
-       warn "W: $pfx.$k has multiple values, only using `$v->[-1]'\n";
+       warn "W: $key has multiple values, only using `$v->[-1]'\n";
        $v->[-1];
 }
 
 sub repo_objs {
        my ($self, $ibxish) = @_;
-       my $ibx_code_repos = $ibxish->{coderepo} or return;
-       $ibxish->{-repo_objs} //= do {
+       my $ibx_code_repos = $ibxish->{coderepo} // return;
+       $ibxish->{-repo_objs} // do {
                my $code_repos = $self->{-code_repos};
                my @repo_objs;
                for my $nick (@$ibx_code_repos) {
@@ -408,14 +391,13 @@ sub repo_objs {
                                next;
                        }
                        my $repo = $code_repos->{$nick} //=
-                                               _fill_code_repo($self, $nick);
+                                               fill_code_repo($self, $nick);
                        push @repo_objs, $repo if $repo;
                }
                if (scalar @repo_objs) {
-                       \@repo_objs;
+                       $ibxish ->{-repo_objs} = \@repo_objs;
                } else {
                        delete $ibxish->{coderepo};
-                       undef;
                }
        }
 }
@@ -424,13 +406,13 @@ sub _fill_ibx {
        my ($self, $name) = @_;
        my $pfx = "publicinbox.$name";
        my $ibx = {};
-       for my $k (qw(watch nntpserver)) {
+       for my $k (qw(watch)) {
                my $v = $self->{"$pfx.$k"};
                $ibx->{$k} = $v if defined $v;
        }
        for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax
                        indexlevel indexsequentialshard boost)) {
-               my $v = get_1($self, $pfx, $k) // next;
+               my $v = get_1($self, "$pfx.$k") // next;
                $ibx->{$k} = $v;
        }
 
@@ -450,8 +432,10 @@ sub _fill_ibx {
        }
        # TODO: more arrays, we should support multi-value for
        # more things to encourage decentralization
-       for my $k (qw(address altid nntpmirror coderepo hide listid url
-                       infourl watchheader)) {
+       for my $k (qw(address altid nntpmirror imapmirror
+                       coderepo hide listid url
+                       infourl watchheader
+                       nntpserver imapserver pop3server)) {
                my $v = $self->{"$pfx.$k"} // next;
                $ibx->{$k} = _array($v);
        }
@@ -522,7 +506,7 @@ sub _fill_ei ($$) {
        }
        my $es = PublicInbox::ExtSearch->new($d);
        for my $k (qw(indexlevel indexsequentialshard)) {
-               my $v = get_1($self, $pfx, $k) // next;
+               my $v = get_1($self, "$pfx.$k") // next;
                $es->{$k} = $v;
        }
        for my $k (qw(coderepo hide url infourl)) {