config: support "inboxdir" in addition to "mainrepo"

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 2b99346a81d0ef021a20f7708b6a1d0a05ef41c1..2da202f99f6dd2e45729cb1a8dcca702d572c726 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -29,13 +29,13 @@ sub new {
        }
        bless $self, $class;
        # caches
-       $self->{-by_addr} ||= {};
-       $self->{-by_list_id} ||= {};
-       $self->{-by_name} ||= {};
-       $self->{-by_newsgroup} ||= {};
-       $self->{-no_obfuscate} ||= {};
-       $self->{-limiters} ||= {};
-       $self->{-code_repos} ||= {}; # nick => PublicInbox::Git object
+       $self->{-by_addr} = {};
+       $self->{-by_list_id} = {};
+       $self->{-by_name} = {};
+       $self->{-by_newsgroup} = {};
+       $self->{-no_obfuscate} = {};
+       $self->{-limiters} = {};
+       $self->{-code_repos} = {}; # nick => PublicInbox::Git object
        $self->{-cgitrc_unparsed} = $self->{'publicinbox.cgitrc'};
 
        if (my $no = delete $self->{'publicinbox.noobfuscate'}) {
@@ -85,7 +85,7 @@ sub lookup_list_id {
 
 sub lookup_name ($$) {
        my ($self, $name) = @_;
-       $self->{-by_name}->{$name} || _fill($self, "publicinbox.$name");
+       $self->{-by_name}->{$name} // _fill($self, "publicinbox.$name");
 }
 
 sub each_inbox {
@@ -93,7 +93,7 @@ sub each_inbox {
        # may auto-vivify if config file is non-existent:
        foreach my $section (@{$self->{-section_order}}) {
                next if $section !~ m!\Apublicinbox\.([^/]+)\z!;
-               $self->{"publicinbox.$1.mainrepo"} or next;
+               defined($self->{"publicinbox.$1.inboxdir"}) or next;
                my $ibx = lookup_name($self, $1) or next;
                $cb->($ibx);
        }
@@ -106,7 +106,7 @@ sub lookup_newsgroup {
 
 sub limiter {
        my ($self, $name) = @_;
-       $self->{-limiters}->{$name} ||= do {
+       $self->{-limiters}->{$name} //= do {
                require PublicInbox::Qspawn;
                my $max = $self->{"publicinboxlimiter.$name.max"} || 1;
                my $limiter = PublicInbox::Qspawn::Limiter->new($max);
@@ -115,7 +115,7 @@ sub limiter {
        };
 }
 
-sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
+sub config_dir { $ENV{PI_DIR} // "$ENV{HOME}/.public-inbox" }
 
 sub default_file {
        my $f = $ENV{PI_CONFIG};
@@ -206,8 +206,8 @@ sub cgit_repo_merge ($$$) {
                $self->{-cgit_remove_suffix} and
                        $rel =~ s!/?\.git\z!!;
        }
-       $self->{"coderepo.$rel.dir"} ||= $path;
-       $self->{"coderepo.$rel.cgiturl"} ||= $rel;
+       $self->{"coderepo.$rel.dir"} //= $path;
+       $self->{"coderepo.$rel.cgiturl"} //= $rel;
 }
 
 sub is_git_dir ($) {
@@ -338,7 +338,7 @@ sub _fill_code_repo {
                # 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 {
+                       $git->{$t.'_url_format'} //= map {
                                "$_/$t/?id=%s"
                        } @$cgits;
                }
@@ -362,12 +362,16 @@ sub _fill {
        my ($self, $pfx) = @_;
        my $ibx = {};
 
-       foreach my $k (qw(mainrepo filter url newsgroup
+       foreach my $k (qw(inboxdir filter url newsgroup
                        infourl watch watchheader httpbackendmax
                        replyto feedmax nntpserver indexlevel)) {
                my $v = $self->{"$pfx.$k"};
                $ibx->{$k} = $v if defined $v;
        }
+
+       # backwards compatibility:
+       $ibx->{inboxdir} //= $self->{"$pfx.mainrepo"};
+
        foreach my $k (qw(obfuscate)) {
                my $v = $self->{"$pfx.$k"};
                defined $v or next;
@@ -385,7 +389,7 @@ sub _fill {
                }
        }
 
-       return unless $ibx->{mainrepo};
+       return unless $ibx->{inboxdir};
        my $name = $pfx;
        $name =~ s/\Apublicinbox\.//;
 
@@ -426,7 +430,7 @@ sub _fill {
                        $valid += valid_inbox_name($_) foreach (@parts);
                        $valid == scalar(@parts) or next;
 
-                       my $repo = $code_repos->{$nick} ||=
+                       my $repo = $code_repos->{$nick} //=
                                                _fill_code_repo($self, $nick);
                        push @$repo_objs, $repo if $repo;
                }