X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwListing.pm;h=03534f03e670c6b92e5da18ab4975984fe88a6ed;hb=9a306585752349cc0508135ecb11d1cb6a7d7f8f;hp=e1473b3deec7135b4aa9557a65371ce9dd469d7a;hpb=e56b908c0e97c2f479b350dfb0868bc463413b89;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index e1473b3d..03534f03 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -9,26 +9,33 @@ use warnings;
use PublicInbox::Hval qw(ascii_html);
use PublicInbox::Linkify;
use PublicInbox::View;
+use bytes ();
+use HTTP::Date qw(time2str);
+require Digest::SHA;
+require File::Spec;
+{ no warnings 'once'; *try_cat = *PublicInbox::Inbox::try_cat };
-sub list_all ($$) {
- my ($self, undef) = @_;
+sub list_all ($$$) {
+ my ($self, $env, $hide_key) = @_;
my @list;
$self->{pi_config}->each_inbox(sub {
my ($ibx) = @_;
- push @list, $ibx unless $ibx->{-hide}->{www};
+ push @list, $ibx unless $ibx->{-hide}->{$hide_key};
});
\@list;
}
-sub list_match_domain ($$) {
- my ($self, $env) = @_;
+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;
+ if (!$ibx->{-hide}->{$hide_key} && $ibx->{url} =~ $re) {
+ push @list, $ibx;
+ }
});
\@list;
}
@@ -42,21 +49,27 @@ my %VALID = (
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;
}
@@ -74,22 +87,20 @@ sub ibx_entry {
$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);
- my $code = 404;
+sub html ($$) {
+ my ($env, $list) = @_;
my $title = 'public-inbox';
my $out = '';
+ my $code = 404;
if (@$list) {
- # Swartzian transform since ->modified is expensive
+ $title .= ' - listing';
+ $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);
@@ -98,7 +109,130 @@ sub call {
$out = "$title" . $out;
$out .= ''. PublicInbox::WwwStream::code_footer($env) .
'
';
- [ $code, $h, [ $out ] ]
+
+ my $h = [ 'Content-Type', 'text/html; charset=UTF-8' ];
+ [ $code, $h, [ $out ] ];
+}
+
+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);
+ }
+ die;
+}
+
+sub fingerprint ($) {
+ my ($git) = @_;
+ my $fh = $git->popen('show-ref') or
+ die "popen($git->{git_dir} show-ref) failed: $!";
+
+ my $dig = Digest::SHA->new(1);
+ while (read($fh, my $buf, 65536)) {
+ $dig->add($buf);
+ }
+ close $fh;
+ return if $?; # empty, uninitialized git repo
+ $dig->hexdigest;
+}
+
+sub manifest_add ($$;$$) {
+ my ($manifest, $ibx, $epoch, $default_desc) = @_;
+ my $url_path = "/$ibx->{name}";
+ my $git_dir = $ibx->{inboxdir};
+ if (defined $epoch) {
+ $git_dir .= "/git/$epoch.git";
+ $url_path .= "/git/$epoch.git";
+ }
+ return unless -d $git_dir;
+ my $git = PublicInbox::Git->new($git_dir);
+ my $fingerprint = fingerprint($git) or return; # no empty repos
+
+ chomp(my $owner = $git->qx('config', 'gitweb.owner'));
+ chomp(my $desc = try_cat("$git_dir/description"));
+ $owner = undef if $owner eq '';
+ $desc = 'Unnamed repository' if $desc eq '';
+
+ # templates/hooks--update.sample and git-multimail in git.git
+ # only match "Unnamed repository", not the full contents of
+ # templates/this--description in git.git
+ if ($desc =~ /\AUnnamed repository/) {
+ $desc = "$default_desc [epoch $epoch]" if defined($epoch);
+ }
+
+ my $reference;
+ chomp(my $alt = try_cat("$git_dir/objects/info/alternates"));
+ if ($alt) {
+ # n.b.: GitPython doesn't seem to handle comments or C-quoted
+ # strings like native git does; and we don't for now, either.
+ my @alt = split(/\n+/, $alt);
+
+ # grokmirror only supports 1 alternate for "reference",
+ if (scalar(@alt) == 1) {
+ my $objdir = "$git_dir/objects";
+ $reference = File::Spec->rel2abs($alt[0], $objdir);
+ $reference =~ s!/[^/]+/?\z!!; # basename
+ }
+ }
+ $manifest->{-abs2urlpath}->{$git_dir} = $url_path;
+ my $modified = $git->modified;
+ if ($modified > $manifest->{-mtime}) {
+ $manifest->{-mtime} = $modified;
+ }
+ $manifest->{$url_path} = {
+ owner => $owner,
+ reference => $reference,
+ description => $desc,
+ modified => $modified,
+ fingerprint => $fingerprint,
+ };
+}
+
+# manifest.js.gz
+sub js ($$) {
+ my ($env, $list) = @_;
+ eval { require IO::Compress::Gzip } or return [ 404, [], [] ];
+
+ my $manifest = { -abs2urlpath => {}, -mtime => 0 };
+ for my $ibx (@$list) {
+ if (defined(my $max = $ibx->max_git_epoch)) {
+ my $desc = $ibx->description;
+ for my $epoch (0..$max) {
+ manifest_add($manifest, $ibx, $epoch, $desc);
+ }
+ } else {
+ manifest_add($manifest, $ibx);
+ }
+ }
+ my $abs2urlpath = delete $manifest->{-abs2urlpath};
+ my $mtime = delete $manifest->{-mtime};
+ while (my ($url_path, $repo) = each %$manifest) {
+ defined(my $abs = $repo->{reference}) or next;
+ $repo->{reference} = $abs2urlpath->{$abs};
+ }
+ my $out;
+ IO::Compress::Gzip::gzip(\(($json ||= _json())->encode($manifest)) =>
+ \$out);
+ $manifest = undef;
+ [ 200, [ qw(Content-Type application/gzip),
+ 'Last-Modified', time2str($mtime),
+ 'Content-Length', bytes::length($out) ], [ $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');
+ js($env, $list);
+ } else { # /
+ my $list = $self->{www_cb}->($self, $env, 'www');
+ html($env, $list);
+ }
}
1;