urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add --delete-bucket option

master
Joey Hess 2008-05-08 16:11:39 -04:00
parent b7950d8d01
commit a50fb83394
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
IkiWiki/Plugin/amazon_s3.pm
View File

@ -17,9 +17,28 @@ BEGIN {
};
sub import { #{{{
hook(type => "getopt", id => "aggregate", call => \&getopt);
hook(type => "checkconfig", id => "amazon_s3", call => \&checkconfig);
} # }}}
sub getopt () { #{{{
eval q{use Getopt::Long};
error($@) if $@;
Getopt::Long::Configure('pass_through');
GetOptions("delete-bucket" => sub {
my $bucket=getbucket();
debug(gettext("deleting bucket.."));
my $resp = $bucket->list_all or die $bucket->err . ": " . $bucket->errstr;
foreach my $key (@{$resp->{keys}}) {
debug("\t".$key->{key});
$bucket->delete_key($key->{key}) or die $bucket->err . ": " . $bucket->errstr;
}
$bucket->delete_bucket or die $bucket->err . ": " . $bucket->errstr;
debug(gettext("done"));
exit(0);
});
} #}}}
sub checkconfig { #{{{
foreach my $field (qw{amazon_s3_key_id amazon_s3_key_file
amazon_s3_bucket}) {
@ -131,7 +150,6 @@ sub writefile ($$$;$$) { #{{{
# TODO: investigate using the new copy operation.
# (It may not be robust enough.)
foreach my $key (@keys) {
debug("storing $key");
my $res;
if (! $writer) {
$res=$bucket->add_key($key, $content, \%opts);
@ -169,7 +187,6 @@ sub prune ($) { #{{{
my $bucket=IkiWiki::Plugin::amazon_s3::getbucket();
foreach my $key (@keys) {
debug("deleting $key");
my $res=$bucket->delete_key($key);
if (! $res) {
error(gettext("Failed to delete file from S3: ").

5
doc/plugins/amazon_s3.mdwn
View File

@ -59,3 +59,8 @@ type uploads.
Copy and rename detection is not done, so if you copy or rename a large file,
it will be re-uploaded, rather than copied.
## deleting a bucket
You can use "ikiwiki -setup my.setup --delete-bucket" to delete anything
that's in the configured bucket, and remove the bucket.