#
# 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;
use PublicInbox::Hval qw(ascii_html);
use URI;
-use constant PI_URL => 'https://public-inbox.org/README.html';
+our $TOR_URL = 'https://www.torproject.org/';
+our $TOR2WEB_URL = 'https://www.tor2web.org/';
+our $CODE_URL = 'https://public-inbox.org/';
+our $PROJECT = 'public-inbox';
+
+# noop for HTTP.pm (and any other PSGI servers)
+sub close {}
sub new {
my ($class, $ctx, $cb) = @_;
- bless { nr => 0, cb => $cb, ctx => $ctx }, $class;
+ bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class;
}
sub response {
@@ -27,13 +37,16 @@ sub _html_top ($) {
my $desc = ascii_html($obj->description);
my $title = $ctx->{-title_html} || $desc;
my $upfx = $ctx->{-upfx} || '';
+ my $help = $upfx.'_/text/help';
my $atom = $ctx->{-atom} || $upfx.'new.atom';
my $tip = $ctx->{-html_tip} || '';
- my $top = "$desc (Atom feed)";
+ my $top = "$desc";
+ my $links = "help / ".
+ "Atom feed";
if ($obj->search) {
my $q_val = $ctx->{-q_value_html};
if (defined $q_val && $q_val ne '') {
- $q_val = qq(\nvalue="$q_val" );
+ $q_val = qq(\nvalue="$q_val");
} else {
$q_val = '';
}
@@ -41,12 +54,13 @@ sub _html_top ($) {
my $extra = $ctx->{-extra_form_html} || '';
my $action = $upfx eq '' ? './' : $upfx;
$top = qq{}
} else {
- $top = '' . $top . '
';
+ $top = '' . $top . "\n" . $links . '
';
}
"$title" .
"{ctx};
my $obj = $ctx->{-inbox};
my $desc = ascii_html($obj->description);
- # FIXME: cleanup
- my $env = $ctx->{env};
- my $scheme = $env->{'psgi.url_scheme'};
- my $host_port = $env->{HTTP_HOST} ||
- "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
- my $http = "$scheme://$host_port".($env->{SCRIPT_NAME} || '/');
- $http = URI->new($http . $obj->{name})->canonical->as_string;
- my %seen = ( $http => 1 );
- my @urls = ($http);
+ my (%seen, @urls);
+ my $http = $obj->base_url($ctx->{env});
+ chop $http; # no trailing slash for clone
+ my $part = $obj->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;
+ 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 (@{$obj->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]";
}
- my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL);
- ''.join("\n",
- '- ' . $desc,
+ if (defined $part) {
+ my $addrs = $obj->{address};
+ $addrs = join(' ', @$addrs) if ref($addrs) eq 'ARRAY';
+ $urls .= <{name} $dir/ $http \\
+ $addrs
+ public-inbox-index $dir
+EOF
+ }
+ my @nntp = map { qq($_) } @{$obj->nntp_url};
+ if (@nntp) {
+ $urls .= "\n\n";
+ $urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
+ $urls .= ' available over NNTP:';
+ $urls .= "\n\t" . join("\n\t", @nntp) . "\n";
+ }
+ if ($urls =~ m!\b[^:]+://\w+\.onion/!) {
+ $urls .= "\n note: .onion URLs require Tor: ";
+ $urls .= qq[$TOR_URL];
+ if ($TOR2WEB_URL) {
+ $urls .= "\n or Tor2web: ";
+ $urls .= qq[$TOR2WEB_URL];
+ }
+ }
+ my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
+ '
'.join("\n\n",
+ $desc,
$urls,
- 'served with software from public-inbox: '
- ."$url",
+ 'AGPL code for this site: '.
+ qq(git clone $url $PROJECT)
).'
';
}
+# callback for HTTP.pm (and any other PSGI servers)
sub getline {
my ($self) = @_;
my $nr = $self->{nr}++;
return _html_top($self) if $nr == 0;
- if (my $mid = $self->{cb}) { # middle
- $mid = $mid->($nr, $self->{ctx}) and return $mid;
+ if (my $middle = $self->{cb}) {
+ $middle = $middle->($nr, $self->{ctx}) and return $middle;
}
delete $self->{cb} ? _html_end($self) : undef;
}
-sub close {}
-
1;