X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwAltId.pm;h=b90819a2d8a10bf3360facd5f341e65f698914cd;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=a45d8061069e9402d8ab72c9d3af1f09895aa356;hpb=0a3da12a2e68af1a979a42f4b429076b0979708d;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwAltId.pm b/lib/PublicInbox/WwwAltId.pm
index a45d8061..b90819a2 100644
--- a/lib/PublicInbox/WwwAltId.pm
+++ b/lib/PublicInbox/WwwAltId.pm
@@ -1,32 +1,23 @@
-# Copyright (C) 2020 all contributors
+# Copyright (C) 2020-2021 all contributors
# License: AGPL-3.0+
# dumps using the ".dump" command of sqlite3(1)
package PublicInbox::WwwAltId;
use strict;
use PublicInbox::Qspawn;
-use PublicInbox::WwwStream;
+use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::AltId;
use PublicInbox::Spawn qw(which);
+use PublicInbox::GzipFilter;
our $sqlite3 = $ENV{SQLITE3};
-sub sqlite3_missing ($) {
- PublicInbox::WwwResponse::oneshot($_[0], 501, \<sqlite3 not available
-
-The administrator needs to install the sqlite3(1) binary
-to support gzipped sqlite3 dumps.
-
-EOF
-}
-
sub check_output {
my ($r, $bref, $ctx) = @_;
- return PublicInbox::WwwResponse::oneshot($ctx, 500) if !defined($r);
+ return html_oneshot($ctx, 500) if !defined($r);
if ($r == 0) {
my $err = eval { $ctx->{env}->{'psgi.errors'} } // \*STDERR;
$err->print("unexpected EOF from sqlite3\n");
- return PublicInbox::WwwResponse::oneshot($ctx, 501);
+ return html_oneshot($ctx, 501);
}
[200, [ qw(Content-Type application/gzip), 'Content-Disposition',
"inline; filename=$ctx->{altid_pfx}.sql.gz" ] ]
@@ -38,32 +29,38 @@ sub check_output {
# and thus not usable from DBD::SQLite.
sub sqldump ($$) {
my ($ctx, $altid_pfx) = @_;
- my $ibx = $ctx->{-inbox};
+ my $env = $ctx->{env};
+ my $ibx = $ctx->{ibx};
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
}
- eval { require PublicInbox::GzipFilter } or
- return PublicInbox::WwwStream::oneshot($ctx, 501, \<gzip output not available
+ if ($env->{REQUEST_METHOD} ne 'POST') {
+ my $url = $ibx->base_url($ctx->{env}) . "$altid_pfx.sql.gz";
+ return html_oneshot($ctx, 405, \<A POST request required to retrieve $altid_pfx.sql.gz
-The administrator needs to install the Compress::Raw::Zlib Perl module
-to support gzipped sqlite3 dumps.
+ curl -XPOST -O $url
+
+or
+
+ curl -XPOST $url | \\
+ gzip -dc | \\
+ sqlite3 /path/to/$altid_pfx.sqlite3
+
EOF
- $sqlite3 //= which('sqlite3');
- if (!defined($sqlite3)) {
- return PublicInbox::WwwStream::oneshot($ctx, 501, \<sqlite3 not available
The administrator needs to install the sqlite3(1) binary
to support gzipped sqlite3 dumps.
-
EOF
- }
# setup stdin, POSIX requires writes <= 512 bytes to succeed so
# we can close the pipe right away.
@@ -73,7 +70,6 @@ EOF
# 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);