lib/PublicInbox/WWW.pm | 2 ++ lib/PublicInbox/WwwAltId.pm | 18 +++++++++++++++++- diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm index 56d2c42a41cd8eafd37444e68495644f28a80388..275e509f2f1136ad62d129e114b245f9c8b75cd4 100644 --- a/lib/PublicInbox/WWW.pm +++ b/lib/PublicInbox/WWW.pm @@ -125,6 +125,8 @@ ($PublicInbox::Hval::FN)\z!ox) { get_vcs_object($ctx, $1, $2, $3); } elsif ($path_info =~ m!$INBOX_RE/($OID_RE)/s\z!o) { r301($ctx, $1, $2, 's/'); + } elsif ($path_info =~ m!$INBOX_RE/(\w+)\.sql\.gz\z!o) { + get_altid_dump($ctx, $1, $2); # convenience redirects order matters } elsif ($path_info =~ m!$INBOX_RE/([^/]{2,})\z!o) { r301($ctx, $1, $2); diff --git a/lib/PublicInbox/WwwAltId.pm b/lib/PublicInbox/WwwAltId.pm index a45d8061069e9402d8ab72c9d3af1f09895aa356..263e884aa445c92b588c1637546166b343205399 100644 --- a/lib/PublicInbox/WwwAltId.pm +++ b/lib/PublicInbox/WwwAltId.pm @@ -38,12 +38,29 @@ # command is implemented, not (AFAIK) in the libsqlite3 library # and thus not usable from DBD::SQLite. sub sqldump ($$) { my ($ctx, $altid_pfx) = @_; + my $env = $ctx->{env}; my $ibx = $ctx->{-inbox}; my $altid_map = $ibx->altid_map; my $fn = $altid_map->{$altid_pfx}; unless (defined $fn) { return PublicInbox::WwwStream::oneshot($ctx, 404, \<`$altid_pfx' is not a valid altid for this inbox +EOF + } + + if ($env->{REQUEST_METHOD} ne 'POST') { + my $url = $ibx->base_url($ctx->{env}) . "$altid_pfx.sql.gz"; + return PublicInbox::WwwStream::oneshot($ctx, 405, \<A POST request required to retrieve $altid_pfx.sql.gz + + curl -XPOST -O $url + +or + + curl -XPOST $url | \\ + gzip -dc | \\ + sqlite3 /path/to/$altid_pfx.sqlite3 + EOF } @@ -73,7 +90,6 @@ close($w) or die "close: $!"; # TODO: use -readonly if available with newer sqlite3(1) my $qsp = PublicInbox::Qspawn->new([$sqlite3, $fn], undef, { 0 => $r }); - my $env = $ctx->{env}; $ctx->{altid_pfx} = $altid_pfx; $env->{'qspawn.filter'} = PublicInbox::GzipFilter->new; $qsp->psgi_return($env, undef, \&check_output, $ctx);