X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwListing.pm;h=fce0e530b24feb91393951cf24223c99ffb4c115;hb=0d38f65c490466837ae091afa7a7b6f59d04ce7c;hp=c063fca690de089777ace789c070b88b2ac0c4a7;hpb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;p=public-inbox.git diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm index c063fca6..fce0e530 100644 --- a/lib/PublicInbox/WwwListing.pm +++ b/lib/PublicInbox/WwwListing.pm @@ -5,242 +5,104 @@ # Used by PublicInbox::WWW package PublicInbox::WwwListing; use strict; -use warnings; -use PublicInbox::Hval qw(ascii_html prurl); +use PublicInbox::Hval qw(prurl fmt_ts); use PublicInbox::Linkify; -use PublicInbox::View; -use PublicInbox::Inbox; -use bytes (); -use HTTP::Date qw(time2str); -require Digest::SHA; -require File::Spec; -*try_cat = \&PublicInbox::Inbox::try_cat; - -sub list_all_i { - my ($ibx, $arg) = @_; - my ($list, $hide_key) = @$arg; - push @$list, $ibx unless $ibx->{-hide}->{$hide_key}; -} - -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, $arg) = @_; - my ($list, $hide_key, $re) = @$arg; - 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 $arg = [ $list, $hide_key, - qr!\A(?:https?:)?//\Q$host\E(?::[0-9]+)?/!i ]; - $self->{pi_config}->each_inbox(\&list_match_domain_i, $arg); - $list; -} - -sub list_404 ($$) { [] } - -# TODO: +cgit -my %VALID = ( - 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 $pi_config = $www->{pi_config}; - bless { - pi_config => $pi_config, - style => $www->style("\0"), - www_cb => set_cb($pi_config, 'publicInbox.wwwListing', 404), - manifest_cb => set_cb($pi_config, 'publicInbox.grokManifest', - 'match=domain'), - }, $class; -} +use PublicInbox::GzipFilter qw(gzf_maybe); +use PublicInbox::ConfigIter; +use bytes (); # bytes::length sub ibx_entry { - my ($mtime, $ibx, $env) = @_; - my $ts = PublicInbox::View::fmt_ts($mtime); - my $url = prurl($env, $ibx->{url}); + my ($ctx, $ibx) = @_; + my $mtime = $ibx->modified; + my $ts = fmt_ts($mtime); + my $url = prurl($ctx->{env}, $ibx->{url}); my $tmp = <<""; * $ts - $url ${\$ibx->description} if (defined(my $info_url = $ibx->{infourl})) { - $tmp .= ' ' . prurl($env, $info_url) . "\n"; - } - $tmp; -} - -sub html ($$) { - my ($env, $list) = @_; - my $title = 'public-inbox'; - my $out = ''; - my $code = 404; - if (@$list) { - $title .= ' - listing'; - $code = 200; - - # Schwartzian transform since Inbox->modified is expensive - @$list = sort { - $b->[0] <=> $a->[0] - } map { [ $_->modified, $_ ] } @$list; - - my $tmp = join("\n", map { ibx_entry(@$_, $env) } @$list); - my $l = PublicInbox::Linkify->new; - $out = '
'.$l->to_html($tmp).'
'. PublicInbox::WwwStream::code_footer($env) . - ''; - - my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ]; - [ $code, $h, [ $out ] ]; + push @{$ctx->{-list}}, [ $mtime, $tmp ]; } -my $json; -sub _json () { - for my $mod (qw(JSON::MaybeXS JSON JSON::PP)) { - eval "require $mod" or next; - # ->ascii encodes non-ASCII to "\uXXXX" - return $mod->new->ascii(1); +sub list_match_i { # ConfigIter callback + my ($cfg, $section, $re, $ctx) = @_; + if (defined($section)) { + return if $section !~ m!\Apublicinbox\.([^/]+)\z!; + my $ibx = $cfg->lookup_name($1) or return; + if (!$ibx->{-hide}->{$ctx->hide_key} && + grep(/$re/, @{$ibx->{url}})) { + $ctx->ibx_entry($ibx); + } + } else { # undef == "EOF" + $ctx->{-wcb}->($ctx->psgi_triple); } - die; } -sub fingerprint ($) { - my ($git) = @_; - # TODO: convert to qspawn for fairness when there's - # thousands of repos - my ($fh, $pid) = $git->popen('show-ref'); - my $dig = Digest::SHA->new(1); - while (read($fh, my $buf, 65536)) { - $dig->add($buf); +sub url_regexp { + my ($ctx, $key, $default) = @_; + $key //= 'publicInbox.wwwListing'; + $default //= '404'; + my $v = $ctx->{www}->{pi_cfg}->{lc $key} // $default; +again: + if ($v eq 'match=domain') { + my $h = $ctx->{env}->{HTTP_HOST} // $ctx->{env}->{SERVER_NAME}; + $h =~ s/:[0-9]+\z//; + qr!\A(?:https?:)?//\Q$h\E(?::[0-9]+)?/!i; + } elsif ($v eq 'all') { + qr/./; + } elsif ($v eq '404') { + undef; + } else { + warn <
'); + my $code = 404; + if (my $list = $ctx->{-list}) { + $code = 200; + # sort by ->modified + @$list = map { $_->[1] } sort { $b->[0] <=> $a->[0] } @$list; + $list = join("\n", @$list); + my $l = PublicInbox::Linkify->new; + $gzf->zmore($l->to_html($list)); + } else { + $gzf->zmore('no inboxes, yet'); } + my $out = $gzf->zflush('
'. + PublicInbox::WwwStream::code_footer($ctx->{env}) . + ''); + $h->[3] = bytes::length($out); + [ $code, $h, [ $out ] ]; } 1;