use warnings;
use PublicInbox::Hval qw(ascii_html);
use URI;
-use constant PI_URL => 'https://public-inbox.org/README.html';
+use constant PI_URL => 'https://public-inbox.org/';
+our $TOR_URL = 'https://www.torproject.org/';
+
+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 {
}
# XXX gross, for SearchView.pm
my $extra = $ctx->{-extra_form_html} || '';
- $top = qq{<form\naction="$upfx"><pre>$top} .
+ my $action = $upfx eq '' ? './' : $upfx;
+ $top = qq{<form\naction="$action"><pre>$top} .
qq{ <input\nname=q\ntype=text$q_val/>} .
$extra .
qq{<input\ntype=submit\nvalue=search />} .
sub _html_end {
my ($self) = @_;
- my $urls = 'Archives are clone-able:';
+ my $urls = 'Archives are clonable:';
my $ctx = $self->{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 $http = $obj->base_url($ctx->{env});
+ chop $http;
my %seen = ( $http => 1 );
my @urls = ($http);
+ my $need_tor;
foreach my $u (@{$obj->cloneurl}) {
next if $seen{$u};
+ $need_tor = 1 if $u =~ m!\A[^:]+://\w+\.onion/!;
$seen{$u} = 1;
push @urls, $u =~ /\Ahttps?:/ ? qq(<a\nhref="$u">$u</a>) : $u;
}
$urls .= "\n" .
join("\n", map { "\tgit clone --mirror $_" } @urls);
}
+
+ if ($need_tor) {
+ $urls .= "\n note: .onion URLs require Tor: ";
+ $urls .= qq[<a\nhref="$TOR_URL">$TOR_URL</a>];
+ }
my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL);
- '<pre>'.join("\n",
- '- ' . $desc,
+ '<hr><pre>'.join("\n\n",
+ $desc,
$urls,
- 'served with software from public-inbox: '
- ."<a\nhref=\"$url\">$url</a>",
+ 'Served with public-inbox: '.
+ qq(git clone <a\nhref="$url">$url</a> public-inbox)
).'</pre></body></html>';
}
delete $self->{cb} ? _html_end($self) : undef;
}
-sub close {}
-
1;