# cgit-compatible /snapshot/ endpoint for WWW coderepos
package PublicInbox::RepoSnapshot;
use v5.12;
-use PublicInbox::Git;
use PublicInbox::Qspawn;
-use PublicInbox::GitAsyncCat;
+use PublicInbox::ViewVCS;
use PublicInbox::WwwStatic qw(r);
# Not using standard mime types since the compressed tarballs are
'ETag', qq("$ctx->{etag}") ] ];
}
-sub archive_cb {
- my ($ctx) = @_;
- my @cfg;
- if (my $cmd = $FMT_CFG{$ctx->{snap_fmt}}) {
- @cfg = ('-c', "tar.$ctx->{snap_fmt}.command=$cmd");
- }
- my $qsp = PublicInbox::Qspawn->new(['git', @cfg,
- "--git-dir=$ctx->{git}->{git_dir}", 'archive',
- "--prefix=$ctx->{snap_pfx}/",
- "--format=$ctx->{snap_fmt}", $ctx->{treeish}]);
- $qsp->psgi_return($ctx->{env}, undef, \&archive_hdr, $ctx);
-}
-
sub ver_check { # git->check_async callback
my ($oid, $type, $size, $ctx) = @_;
- if ($type eq 'missing') { # try 'v' and 'V' prefixes
- my $pfx = shift @{$ctx->{try_pfx}} or return
+ return if defined $ctx->{etag};
+ my $treeish = shift @{$ctx->{-try}} // die 'BUG: no {-try}';
+ if ($type eq 'missing') {
+ scalar(@{$ctx->{-try}}) or
delete($ctx->{env}->{'qspawn.wcb'})->(r(404));
- my $v = $ctx->{treeish} = $pfx.$ctx->{snap_ver};
- return $ctx->{env}->{'pi-httpd.async'} ?
- async_check($ctx, $v, \&ver_check, $ctx) :
- $ctx->{git}->check_async($v, \&ver_check, $ctx);
+ } else { # found, done:
+ $ctx->{etag} = $oid;
+ my @cfg;
+ if (my $cmd = $FMT_CFG{$ctx->{snap_fmt}}) {
+ @cfg = ('-c', "tar.$ctx->{snap_fmt}.command=$cmd");
+ }
+ my $qsp = PublicInbox::Qspawn->new(['git', @cfg,
+ "--git-dir=$ctx->{git}->{git_dir}", 'archive',
+ "--prefix=$ctx->{snap_pfx}/",
+ "--format=$ctx->{snap_fmt}", $treeish]);
+ $qsp->psgi_return($ctx->{env}, undef, \&archive_hdr, $ctx);
}
- $ctx->{etag} = $oid;
- archive_cb($ctx);
}
sub srv {
substr($fn, 0, length($pfx)) eq $pfx or return;
$ctx->{snap_pfx} = $fn;
my $v = $ctx->{snap_ver} = substr($fn, length($pfx), length($fn));
- $ctx->{treeish} = $v; # try without [vV] prefix, first
- @{$ctx->{try_pfx}} = qw(v V); # cf. cgit:ui-snapshot.c
+ # try without [vV] prefix, first
+ my @try = map { "$_$v" } ('', 'v', 'V'); # cf. cgit:ui-snapshot.c
+ @{$ctx->{-try}} = @try;
sub {
$ctx->{env}->{'qspawn.wcb'} = $_[0];
- if ($ctx->{env}->{'pi-httpd.async'}) {
- async_check($ctx, $v, \&ver_check, $ctx);
- } else {
- $ctx->{git}->check_async($v, \&ver_check, $ctx);
- $ctx->{git}->check_async_wait;
- }
+ PublicInbox::ViewVCS::do_check_async($ctx, \&ver_check, @try);
}
}
package PublicInbox::RepoTree;
use v5.12;
use PublicInbox::ViewDiff qw(uri_escape_path);
-use PublicInbox::GitAsyncCat;
use PublicInbox::WwwStatic qw(r);
use PublicInbox::Qspawn;
use PublicInbox::WwwStream qw(html_oneshot);
return if index($obj, "\n") >= 0;
sub {
$ctx->{-wcb} = $_[0]; # HTTP::{Chunked,Identity}
- if ($ctx->{env}->{'pi-httpd.async'}) {
- async_check($ctx, $obj, \&tree_show, $ctx);
- } else {
- $ctx->{git}->check_async($obj, \&tree_show, $ctx);
- $ctx->{git}->async_wait_all;
- }
+ PublicInbox::ViewVCS::do_check_async($ctx, \&tree_show, $obj);
};
}
}
sub do_cat_async {
- my ($ctx, $cb, @oids) = @_;
+ my ($ctx, $cb, @req) = @_;
# favor git(1) over Gcf2 (libgit2) for SHA-256 support
- $ctx->{git}->cat_async($_, $cb, $ctx) for @oids;
+ $ctx->{git}->cat_async($_, $cb, $ctx) for @req;
if ($ctx->{env}->{'pi-httpd.async'}) {
PublicInbox::GitAsyncCat::watch_cat($ctx->{git});
} else { # synchronous, generic PSGI
}
}
+sub do_check_async {
+ my ($ctx, $cb, @req) = @_;
+ if ($ctx->{env}->{'pi-httpd.async'}) {
+ async_check($ctx, $_, $cb, $ctx) for @req;
+ } else { # synchronous, generic PSGI
+ $ctx->{git}->check_async($_, $cb, $ctx) for @req;
+ $ctx->{git}->check_async_wait;
+ }
+}
+
sub show_commit_start { # ->psgi_qx callback
my ($bref, $ctx) = @_;
if (my $qsp_err = delete $ctx->{-qsp_err}) {