X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwListing.pm;h=c37796195e681441106c5e6218041ecbacdae2b5;hp=76c76663a059889e5a1b52402486081de8b3791d;hb=5b96edcb1e0d825244d5a12470e0f32526262611;hpb=5860b498af67dc0944c39667e3899485b5650387 diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm index 76c76663..c3779619 100644 --- a/lib/PublicInbox/WwwListing.pm +++ b/lib/PublicInbox/WwwListing.pm @@ -5,24 +5,31 @@ # Used by PublicInbox::WWW package PublicInbox::WwwListing; use strict; +use v5.10.1; use PublicInbox::Hval qw(prurl fmt_ts ascii_html); -use PublicInbox::Linkify; use PublicInbox::GzipFilter qw(gzf_maybe); use PublicInbox::ConfigIter; use PublicInbox::WwwStream; -use bytes (); # bytes::length +use URI::Escape qw(uri_escape_utf8); sub ibx_entry { my ($ctx, $ibx, $ce) = @_; - $ce->{description} //= $ibx->description; + my $desc = ascii_html($ce->{description} //= $ibx->description); my $ts = fmt_ts($ce->{-modified} //= $ibx->modified); - my $url = prurl($ctx->{env}, $ibx->{url}); - my $tmp = <<""; -* $ts - $url - $ce->{description} - - if (defined(my $info_url = $ibx->{infourl})) { - $tmp .= ' ' . prurl($ctx->{env}, $info_url) . "\n"; + my ($url, $href); + if (scalar(@{$ibx->{url} // []})) { + $url = $href = ascii_html(prurl($ctx->{env}, $ibx->{url})); + } else { + $href = ascii_html(uri_escape_utf8($ibx->{name})) . '/'; + $url = ascii_html($ibx->{name}); + } + my $tmp = <$url + $desc +EOM + if (defined($url = $ibx->{infourl})) { + $url = ascii_html(prurl($ctx->{env}, $url)); + $tmp .= qq( $url\n); } push(@{$ctx->{-list}}, (scalar(@_) == 3 ? # $misc in use, already sorted $tmp : [ $ce->{-modified}, $tmp ] )); @@ -34,7 +41,7 @@ sub list_match_i { # ConfigIter callback return if $section !~ m!\Apublicinbox\.([^/]+)\z!; my $ibx = $cfg->lookup_name($1) or return; if (!$ibx->{-hide}->{$ctx->hide_key} && - grep(/$re/, @{$ibx->{url}})) { + grep(/$re/, @{$ibx->{url} // []})) { $ctx->ibx_entry($ibx); } } else { # undef == "EOF" @@ -55,7 +62,7 @@ again: } elsif ($v eq 'all') { (qr/./, undef); } elsif ($v eq '404') { - undef; + (undef, undef); } else { warn <retry_reopen callback limit => $q->{l} }; $qs .= ' type:inbox'; - if (my $user_query = $q->{'q'}) { + + delete $ctx->{-list}; # reset if retried + my $pi_cfg = $ctx->{www}->{pi_cfg}; + my $user_query = $q->{'q'} // ''; + if ($user_query =~ /\S/) { $qs = "( $qs ) AND ( $user_query )"; + } else { # special case for ALL + $ctx->ibx_entry($pi_cfg->ALL // die('BUG: ->ALL expected'), {}); } my $mset = $misc->mset($qs, $opt); # sorts by $MODIFIED (mtime) - delete $ctx->{-list}; # reset if retried - my $pi_cfg = $ctx->{www}->{pi_cfg}; + my $hide_key = $ctx->hide_key; + for my $mi ($mset->items) { my $doc = $mi->get_document; my ($eidx_key) = PublicInbox::Search::xap_terms('Q', $doc); $eidx_key // next; my $ibx = $pi_cfg->lookup_eidx_key($eidx_key) // next; - next if $ibx->{-hide}->{$ctx->hide_key}; - grep(/$re/, @{$ibx->{url}}) or next; + next if $ibx->{-hide}->{$hide_key}; + grep(/$re/, @{$ibx->{url} // []}) or next; $ctx->ibx_entry($ibx, $misc->doc2ibx_cache_ent($doc)); if ($r) { # for descriptions in search_nav_bot my $pct = PublicInbox::Search::get_pct($mi); @@ -190,9 +203,9 @@ sub psgi_triple { my $h = [ 'Content-Type', 'text/html; charset=UTF-8', 'Content-Length', undef ]; my $gzf = gzf_maybe($h, $ctx->{env}); - $gzf->zmore('' . - 'public-inbox listing' . - ''); + $gzf->zmore('public-inbox listing' . + $ctx->{www}->style('+/') . + ''); my $code = 404; if (my $list = delete $ctx->{-list}) { my $mset = delete $ctx->{-mset}; @@ -203,17 +216,18 @@ sub psgi_triple { @$list = map { $_->[1] } sort { $b->[0] <=> $a->[0] } @$list; } - $list = join("\n", @$list); - my $l = PublicInbox::Linkify->new; - $gzf->zmore('
'.$l->to_html($list));
+		$gzf->zmore('
');
+		$gzf->zmore(join("\n", @$list));
 		$gzf->zmore(mset_footer($ctx, $mset)) if $mset;
+	} elsif (my $mset = delete $ctx->{-mset}) {
+		$gzf->zmore(mset_nav_top($ctx, $mset));
+		$gzf->zmore('
no matching inboxes');
+		$gzf->zmore(mset_footer($ctx, $mset));
 	} else {
 		$gzf->zmore('
no inboxes, yet');
 	}
-	my $out = $gzf->zflush('
'.
-			PublicInbox::WwwStream::code_footer($ctx->{env}) .
-			'
');
-	$h->[3] = bytes::length($out);
+	my $out = $gzf->zflush('
');
+	$h->[3] = length($out);
 	[ $code, $h, [ $out ] ];
 }