X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=7399b0ad314dce3ed2adae9e059bdd9fb1488381;hb=2052e92ba1f75efca6935558ea01898d01751f40;hp=f6c504966e5b037413faf053a8777f84353d0250;hpb=fe86054ee1e2d93b19762a34ed1aaebe43635ff0;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index f6c50496..7399b0ad 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2018 all contributors +# Copyright (C) 2016-2019 all contributors # License: AGPL-3.0+ # # HTML body stream for which yields getline+close methods @@ -85,11 +85,11 @@ sub _html_end { my (%seen, @urls); my $http = $ibx->base_url($ctx->{env}); chop $http; # no trailing slash for clone - my $part = $ibx->max_git_part; + 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; my $url = "$http/$i"; @@ -101,7 +101,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 +109,13 @@ sub _html_end { push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $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 .= <{-upfx} // '').'_/text/config/raw'; + $urls .= qq(\nExample config snippet for mirrors\n); my @nntp = map { qq($_) } @{$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";