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

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

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index f6c504966e5b037413faf053a8777f84353d0250..6696cc35d4d1e24e402ab6ad49f03275a0761333 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # HTML body stream for which yields getline+close methods
@@ -19,7 +19,15 @@ sub close {}
 
 sub new {
        my ($class, $ctx, $cb) = @_;
-       bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class;
+
+       my $base_url = $ctx->{-inbox}->base_url($ctx->{env});
+       chop $base_url; # no trailing slash for clone
+       bless {
+               nr => 0,
+               cb => $cb || *close,
+               ctx => $ctx,
+               base_url => $base_url,
+       }, $class;
 }
 
 sub response {
@@ -83,15 +91,14 @@ sub _html_end {
        my $desc = ascii_html($ibx->description);
 
        my (%seen, @urls);
-       my $http = $ibx->base_url($ctx->{env});
-       chop $http; # no trailing slash for clone
-       my $part = $ibx->max_git_part;
+       my $http = $self->{base_url};
+       my $max = $ibx->max_git_epoch;
        my $dir = (split(m!/!, $http))[-1];
-       if (defined($part)) { # v2
+       if (defined($max)) { # v2
                $seen{$http} = 1;
-               for my $i (0..$part) {
+               for my $i (0..$max) {
                        # old parts my be deleted:
-                       -d "$ibx->{mainrepo}/git/$i.git" or next;
+                       -d "$ibx->{inboxdir}/git/$i.git" or next;
                        my $url = "$http/$i";
                        $seen{$url} = 1;
                        push @urls, "$url $dir/git/$i.git";
@@ -101,7 +108,7 @@ sub _html_end {
                push @urls, $http;
        }
 
-       # FIXME: partitioning in can be different in other repositories,
+       # FIXME: epoch splits can be different in other repositories,
        # use the "cloneurl" file as-is for now:
        foreach my $u (@{$ibx->cloneurl}) {
                next if $seen{$u};
@@ -109,13 +116,13 @@ sub _html_end {
                push @urls, $u =~ /\Ahttps?:/ ? qq(<a\nhref="$u">$u</a>) : $u;
        }
 
-       if (defined($part) || scalar(@urls) > 1) {
+       if (defined($max) || scalar(@urls) > 1) {
                $urls .= "\n" .
                        join("\n", map { "\tgit clone --mirror $_" } @urls);
        } else {
                $urls .= " git clone --mirror $urls[0]";
        }
-       if (defined $part) {
+       if (defined $max) {
                my $addrs = $ibx->{address};
                $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY';
                $urls .=  <<EOF
@@ -127,10 +134,15 @@ sub _html_end {
                $addrs
        public-inbox-index $dir
 EOF
+       } else { # v1
+               $urls .= "\n";
        }
+
+       my $cfg_link = ($ctx->{-upfx} // '').'_/text/config/raw';
+       $urls .= qq(\nExample <a\nhref="$cfg_link">config snippet</a> for mirrors\n);
        my @nntp = map { qq(<a\nhref="$_">$_</a>) } @{$ibx->nntp_url};
        if (@nntp) {
-               $urls .= "\n\n";
+               $urls .= "\n";
                $urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
                $urls .= ' available over NNTP:';
                $urls .= "\n\t" . join("\n\t", @nntp) . "\n";