X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwListing.pm;h=a7c7cbc1239e6025e6594524a68ed803263dfcb1;hb=352e2799ecec328f71aa33219214a0e3fc3d5f10;hp=e1473b3deec7135b4aa9557a65371ce9dd469d7a;hpb=fc483fde5dc78d7e6b230527e375c5f421997565;p=public-inbox.git

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index e1473b3d..a7c7cbc1 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -1,104 +1,133 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Provide an HTTP-accessible listing of inboxes.
 # Used by PublicInbox::WWW
 package PublicInbox::WwwListing;
 use strict;
-use warnings;
-use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::Hval qw(ascii_html prurl fmt_ts);
 use PublicInbox::Linkify;
-use PublicInbox::View;
-
-sub list_all ($$) {
-	my ($self, undef) = @_;
-	my @list;
-	$self->{pi_config}->each_inbox(sub {
-		my ($ibx) = @_;
-		push @list, $ibx unless $ibx->{-hide}->{www};
-	});
-	\@list;
+use PublicInbox::GzipFilter qw(gzf_maybe);
+use PublicInbox::ManifestJsGz;
+use bytes (); # bytes::length
+
+sub list_all_i {
+	my ($ibx, $list, $hide_key) = @_;
+	push @$list, $ibx unless $ibx->{-hide}->{$hide_key};
 }
 
-sub list_match_domain ($$) {
-	my ($self, $env) = @_;
-	my @list;
+sub list_all ($$$) {
+	my ($self, $env, $hide_key) = @_;
+	my $list = [];
+	$self->{pi_config}->each_inbox(\&list_all_i, $list, $hide_key);
+	$list;
+}
+
+sub list_match_domain_i {
+	my ($ibx, $list, $hide_key, $re) = @_;
+	if (!$ibx->{-hide}->{$hide_key} && grep(/$re/, @{$ibx->{url}})) {
+		push @$list, $ibx;
+	}
+}
+
+sub list_match_domain ($$$) {
+	my ($self, $env, $hide_key) = @_;
+	my $list = [];
 	my $host = $env->{HTTP_HOST} // $env->{SERVER_NAME};
 	$host =~ s/:[0-9]+\z//;
-	my $re = qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i;
-	$self->{pi_config}->each_inbox(sub {
-		my ($ibx) = @_;
-		push @list, $ibx if !$ibx->{-hide}->{www} && $ibx->{url} =~ $re;
-	});
-	\@list;
+	$self->{pi_config}->each_inbox(\&list_match_domain_i, $list, $hide_key,
+				qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i);
+	$list;
 }
 
 sub list_404 ($$) { [] }
 
 # TODO: +cgit
 my %VALID = (
-	all => *list_all,
-	'match=domain' => *list_match_domain,
-	404 => *list_404,
+	all => \&list_all,
+	'match=domain' => \&list_match_domain,
+	404 => \&list_404,
 );
 
+sub set_cb ($$$) {
+	my ($pi_config, $k, $default) = @_;
+	my $v = $pi_config->{lc $k} // $default;
+	$VALID{$v} || do {
+		warn <<"";
+`$v' is not a valid value for `$k'
+$k be one of `all', `match=domain', or `404'
+
+		$VALID{$default};
+	};
+}
+
 sub new {
 	my ($class, $www) = @_;
-	my $k = 'publicinbox.wwwListing';
 	my $pi_config = $www->{pi_config};
-	my $v = $pi_config->{lc($k)} // 404;
 	bless {
 		pi_config => $pi_config,
 		style => $www->style("\0"),
-		list_cb => $VALID{$v} || do {
-			warn <<"";
-`$v' is not a valid value for `$k'
-$k be one of `all', `match=domain', or `404'
-
-			*list_404;
-		},
+		www_cb => set_cb($pi_config, 'publicInbox.wwwListing', 404),
+		manifest_cb => set_cb($pi_config, 'publicInbox.grokManifest',
+					'match=domain'),
 	}, $class;
 }
 
 sub ibx_entry {
 	my ($mtime, $ibx, $env) = @_;
-	my $ts = PublicInbox::View::fmt_ts($mtime);
-	my $url = PublicInbox::Hval::prurl($env, $ibx->{url});
+	my $ts = fmt_ts($mtime);
+	my $url = prurl($env, $ibx->{url});
 	my $tmp = <<"";
 * $ts - $url
   ${\$ibx->description}
 
-	if (defined(my $info_url = $ibx->{info_url})) {
-		$tmp .= "\n$info_url";
+	if (defined(my $info_url = $ibx->{infourl})) {
+		$tmp .= '  ' . prurl($env, $info_url) . "\n";
 	}
 	$tmp;
 }
 
-# not really a stand-alone PSGI app, but maybe it could be...
-sub call {
-	my ($self, $env) = @_;
-	my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
-	my $list = $self->{list_cb}->($self, $env);
+sub html ($$) {
+	my ($env, $list) = @_;
+	my $h = [ 'Content-Type', 'text/html; charset=UTF-8',
+			'Content-Length', undef ];
+	my $gzf = gzf_maybe($h, $env);
+	$gzf->zmore('<html><head><title>' .
+				'public-inbox listing</title>' .
+				'</head><body><pre>');
 	my $code = 404;
-	my $title = 'public-inbox';
-	my $out = '';
 	if (@$list) {
-		# Swartzian transform since ->modified is expensive
+		$code = 200;
+		# Schwartzian transform since Inbox->modified is expensive
 		@$list = sort {
 			$b->[0] <=> $a->[0]
 		} map { [ $_->modified, $_ ] } @$list;
 
-		$code = 200;
-		$title .= ' - listing';
 		my $tmp = join("\n", map { ibx_entry(@$_, $env) } @$list);
 		my $l = PublicInbox::Linkify->new;
-		$l->linkify_1($tmp);
-		$out = '<pre>'.$l->linkify_2(ascii_html($tmp)).'</pre><hr>';
+		$gzf->zmore($l->to_html($tmp));
+	} else {
+		$gzf->zmore('no inboxes, yet');
+	}
+	my $out = $gzf->zflush('</pre><hr><pre>'.
+				PublicInbox::WwwStream::code_footer($env) .
+				'</pre></body></html>');
+	$h->[3] = bytes::length($out);
+	[ $code, $h, [ $out ] ];
+}
+
+# not really a stand-alone PSGI app, but maybe it could be...
+sub call {
+	my ($self, $env) = @_;
+
+	if ($env->{PATH_INFO} eq '/manifest.js.gz') {
+		# grokmirror uses relative paths, so it's domain-dependent
+		my $list = $self->{manifest_cb}->($self, $env, 'manifest');
+		PublicInbox::ManifestJsGz::response($env, $list);
+	} else { # /
+		my $list = $self->{www_cb}->($self, $env, 'www');
+		html($env, $list);
 	}
-	$out = "<html><head><title>$title</title></head><body>" . $out;
-	$out .= '<pre>'. PublicInbox::WwwStream::code_footer($env) .
-		'</pre></body></html>';
-	[ $code, $h, [ $out ] ]
 }
 
 1;