X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=8b79923b64efeab0946e18b1b3bf03094dd6a5fc;hb=6e6f7999361925e4c944f308df4bc32a1842cd69;hp=01f7b31ba186001723d21dcbe2d3291e5f4383bc;hpb=21f5b7a8bcd942b19475c1c0c265f39dfdf93608;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 01f7b31b..8b79923b 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,7 +1,11 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2018 all contributors
# License: AGPL-3.0+
#
# HTML body stream for which yields getline+close methods
+#
+# public-inbox-httpd favors "getline" response bodies to take a
+# "pull"-based approach to feeding slow clients (as opposed to a
+# more common "push" model)
package PublicInbox::WwwStream;
use strict;
use warnings;
@@ -29,17 +33,19 @@ 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';
+ my $color = $upfx.'_/text/color';
my $atom = $ctx->{-atom} || $upfx.'new.atom';
my $tip = $ctx->{-html_tip} || '';
my $top = "$desc";
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");
@@ -61,7 +67,7 @@ sub _html_top ($) {
"$title" .
"" .
- PublicInbox::Hval::STYLE .
+ $ctx->{www}->style($upfx) .
"". $top . $tip;
}
@@ -69,26 +75,56 @@ 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 $http = $obj->base_url($ctx->{env});
- chop $http;
- my %seen = ( $http => 1 );
- my @urls = ($http);
- foreach my $u (@{$obj->cloneurl}) {
+ my (%seen, @urls);
+ my $http = $ibx->base_url($ctx->{env});
+ chop $http; # no trailing slash for clone
+ 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 "$ibx->{mainrepo}/git/$i.git" or next;
+ my $url = "$http/$i";
+ $seen{$url} = 1;
+ push @urls, "$url $dir/git/$i.git";
+ }
+ } else { # v1
+ $seen{$http} = 1;
+ push @urls, $http;
+ }
+
+ # FIXME: partitioning in can be different in other repositories,
+ # use the "cloneurl" file as-is for now:
+ foreach my $u (@{$ibx->cloneurl}) {
next if $seen{$u};
$seen{$u} = 1;
push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u;
}
- if (scalar(@urls) == 1) {
- $urls .= " git clone --mirror $http";
- } else {
+
+ if (defined($part) || scalar(@urls) > 1) {
$urls .= "\n" .
join("\n", map { "\tgit clone --mirror $_" } @urls);
+ } else {
+ $urls .= " git clone --mirror $urls[0]";
}
+ if (defined $part) {
+ my $addrs = $ibx->{address};
+ $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY';
+ $urls .= <$_) } @{$obj->nntp_url};
+
+ # If you have public-inbox 1.1+ installed, you may
+ # initialize and index your mirror using the following commands:
+ public-inbox-init -V2 $ibx->{name} $dir/ $http \\
+ $addrs
+ public-inbox-index $dir
+EOF
+ }
+ my @nntp = map { qq($_) } @{$ibx->nntp_url};
if (@nntp) {
$urls .= "\n\n";
$urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';