X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=ec9ae0cf25b167fc296bb37ada4184923ad3fa13;hb=10e38b3b0fdad7e2881f0571f9b2717df2151f7a;hp=62a4fe2607ee4fd3e17ad93dbd73cc87cf96b1be;hpb=4af9fd9c5e46eed341a535f37d54cf228303326c;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 62a4fe26..ec9ae0cf 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -7,11 +7,21 @@ 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 $CODE_URL = 'https://public-inbox.org/'; +our $PROJECT = 'public-inbox'; + +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 { + my ($class, $ctx, $code, $cb) = @_; + [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], + $class->new($ctx, $cb) ] } sub _html_top ($) { @@ -22,10 +32,21 @@ sub _html_top ($) { my $title = $ctx->{-title_html} || $desc; my $upfx = $ctx->{-upfx} || ''; my $atom = $ctx->{-atom} || $upfx.'new.atom'; + my $tip = $ctx->{-html_tip} || ''; my $top = "$desc (Atom feed)"; if ($obj->search) { - $top = qq{
$top} .
-			  qq{ } .
+		my $q_val = $ctx->{-q_value_html};
+		if (defined $q_val && $q_val ne '') {
+			$q_val = qq(\nvalue="$q_val" );
+		} else {
+			$q_val = '';
+		}
+		# XXX gross, for SearchView.pm
+		my $extra = $ctx->{-extra_form_html} || '';
+		my $action = $upfx eq '' ? './' : $upfx;
+		$top = qq{
$top} .
+			  qq{ } .
+			  $extra .
 			  qq{} .
 			  q{
}
 	} else {
@@ -35,38 +56,44 @@ sub _html_top ($) {
 		"" .
 		PublicInbox::Hval::STYLE .
-		"$top";
+		"". $top . $tip;
 }
 
 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);
-	my @urls = @{$obj->cloneurl};
-	my %seen = map { $_ => 1 } @urls;
 
-	# 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;
-	$seen{$http} or unshift @urls, $http;
+	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($u) : $u;
+	}
 	if (scalar(@urls) == 1) {
-		$urls .= " git clone --mirror $urls[0]";
+		$urls .= " git clone --mirror $http";
 	} else {
 		$urls .= "\n" .
 			join("\n", map { "\tgit clone --mirror $_" } @urls);
 	}
-	my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL);
-	'
'.join("\n",
-		'- ' . $desc,
+
+	if ($need_tor) {
+		$urls .= "\n note: .onion URLs require Tor: ";
+		$urls .= qq[$TOR_URL];
+	}
+	my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
+	'
'.join("\n\n",
+		$desc,
 		$urls,
-		'served with software from public-inbox: '
-			."$url",
+		'Code for this site: '.
+		qq(git clone $url $PROJECT)
 	).'
';
 }
 
@@ -83,6 +110,4 @@ sub getline {
 	delete $self->{cb} ? _html_end($self) : undef;
 }
 
-sub close {}
-
 1;