X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=8b79923b64efeab0946e18b1b3bf03094dd6a5fc;hb=6e6f7999361925e4c944f308df4bc32a1842cd69;hp=8ae35c73931f19f947b0f99a076db6f832ec6e35;hpb=c2d12f79e78eb4ea909cac6106880c0f41e8c5fd;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 8ae35c73..8b79923b 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -33,8 +33,8 @@ sub response { sub _html_top ($) { my ($self) = @_; my $ctx = $self->{ctx}; - my $obj = $ctx->{-inbox}; - my $desc = ascii_html($obj->description); + my $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->description); my $title = $ctx->{-title_html} || $desc; my $upfx = $ctx->{-upfx} || ''; my $help = $upfx.'_/text/help'; @@ -45,7 +45,7 @@ sub _html_top ($) { my $links = "help / ". "color / ". "Atom feed"; - if ($obj->search) { + if ($ibx->search) { my $q_val = $ctx->{-q_value_html}; if (defined $q_val && $q_val ne '') { $q_val = qq(\nvalue="$q_val"); @@ -75,19 +75,19 @@ sub _html_end { my ($self) = @_; my $urls = 'Archives are clonable:'; my $ctx = $self->{ctx}; - my $obj = $ctx->{-inbox}; - my $desc = ascii_html($obj->description); + my $ibx = $ctx->{-inbox}; + my $desc = ascii_html($ibx->description); my (%seen, @urls); - my $http = $obj->base_url($ctx->{env}); + my $http = $ibx->base_url($ctx->{env}); chop $http; # no trailing slash for clone - my $part = $obj->max_git_part; + my $part = $ibx->max_git_part; my $dir = (split(m!/!, $http))[-1]; if (defined($part)) { # v2 $seen{$http} = 1; for my $i (0..$part) { # old parts my be deleted: - -d "$obj->{mainrepo}/git/$i.git" or next; + -d "$ibx->{mainrepo}/git/$i.git" or next; my $url = "$http/$i"; $seen{$url} = 1; push @urls, "$url $dir/git/$i.git"; @@ -99,7 +99,7 @@ sub _html_end { # FIXME: partitioning in can be different in other repositories, # use the "cloneurl" file as-is for now: - foreach my $u (@{$obj->cloneurl}) { + foreach my $u (@{$ibx->cloneurl}) { next if $seen{$u}; $seen{$u} = 1; push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; @@ -112,19 +112,19 @@ sub _html_end { $urls .= " git clone --mirror $urls[0]"; } if (defined $part) { - my $addrs = $obj->{address}; + my $addrs = $ibx->{address}; $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY'; $urls .= <{name} $dir/ $http \\ + public-inbox-init -V2 $ibx->{name} $dir/ $http \\ $addrs public-inbox-index $dir EOF } - my @nntp = map { qq($_) } @{$obj->nntp_url}; + my @nntp = map { qq($_) } @{$ibx->nntp_url}; if (@nntp) { $urls .= "\n\n"; $urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';