add a long name for mdwn ("Markdown")

[git.ikiwiki.info.git] / IkiWiki / Plugin / amazon_s3.pm

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index 6652b9fba6a424512f95db2234160721e24c7881..10bf358e44a69148954fc36a0557330016fa4024 100644 (file)
--- a/IkiWiki/Plugin/amazon_s3.pm
+++ b/IkiWiki/Plugin/amazon_s3.pm
@@ -4,7 +4,7 @@ package IkiWiki::Plugin::amazon_s3;
 use warnings;
 no warnings 'redefine';
 use strict;
 use warnings;
 no warnings 'redefine';
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use IkiWiki::Render;
 use Net::Amazon::S3;
 
 use IkiWiki::Render;
 use Net::Amazon::S3;
 


@@ -16,11 +16,81 @@ BEGIN {
        }
 };
 
        }
 };
 

-sub import { #{{{
+sub import {
+       hook(type => "getopt", id => "amazon_s3", call => \&getopt);
+       hook(type => "getsetup", id => "amazon_s3", call => \&getsetup);

        hook(type => "checkconfig", id => "amazon_s3", call => \&checkconfig);
        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 getsetup () {
+       return
+               plugin => {
+                       safe => 0,
+                       rebuild => 0,
+               },
+               amazon_s3_key_id => {
+                       type => "string",
+                       example => "XXXXXXXXXXXXXXXXXXXX",
+                       description => "public access key id",
+                       safe => 1,
+                       rebuild => 0,
+               },
+               amazon_s3_key_id => {
+                       type => "string",
+                       example => "$ENV{HOME}/.s3_key",
+                       description => "file holding secret key (must not be readable by others!)",
+                       safe => 0, # ikiwiki reads this file
+                       rebuild => 0,
+               },
+               amazon_s3_bucket => {
+                       type => "string",
+                       example => "mywiki",
+                       description => "globally unique name of bucket to store wiki in",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               amazon_s3_prefix => {
+                       type => "string",
+                       example => "wiki/",
+                       description => "a prefix to prepend to each page name",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               amazon_s3_location => {
+                       type => "string",
+                       example => "EU",
+                       description => "which S3 datacenter to use (leave blank for default)",
+                       safe => 1,
+                       rebuild => 1,
+               },
+               amazon_s3_dupindex => {
+                       type => "boolean",
+                       example => 0,
+                       description => "store each index file twice? (allows urls ending in \"/index.html\" and \"/\")",
+                       safe => 1,
+                       rebuild => 1,
+               },
+}

 
 

-sub checkconfig { #{{{
+sub checkconfig {

        foreach my $field (qw{amazon_s3_key_id amazon_s3_key_file
                              amazon_s3_bucket}) {
                if (! exists $config{$field} || ! defined $config{$field}) {
        foreach my $field (qw{amazon_s3_key_id amazon_s3_key_file
                              amazon_s3_bucket}) {
                if (! exists $config{$field} || ! defined $config{$field}) {


@@ -31,11 +101,11 @@ sub checkconfig { #{{{
            ! defined $config{amazon_s3_prefix}) {
            $config{amazon_s3_prefix}="wiki/";
        }
            ! defined $config{amazon_s3_prefix}) {
            $config{amazon_s3_prefix}="wiki/";
        }

-} #}}}
+}

 
 {
 my $bucket;
 
 {
 my $bucket;

-sub getbucket { #{{{
+sub getbucket {

        return $bucket if defined $bucket;
        
        open(IN, "<", $config{amazon_s3_key_file}) || error($config{amazon_s3_key_file}.": ".$!);
        return $bucket if defined $bucket;
        
        open(IN, "<", $config{amazon_s3_key_file}) || error($config{amazon_s3_key_file}.": ".$!);


@@ -68,11 +138,11 @@ sub getbucket { #{{{
        }
 
        return $bucket;
        }
 
        return $bucket;

-} #}}}
+}

 }
 
 # Given a file, return any S3 keys associated with it.
 }
 
 # Given a file, return any S3 keys associated with it.

-sub file2keys ($) { #{{{
+sub file2keys ($) {

        my $file=shift;
 
        my @keys;
        my $file=shift;
 
        my @keys;


@@ -92,14 +162,14 @@ sub file2keys ($) { #{{{
                }
        }
        return @keys;
                }
        }
        return @keys;

-} #}}}
+}

 
 package IkiWiki;
 use File::MimeInfo;
 use Encode;
 
 # This is a wrapper around the real writefile.
 
 package IkiWiki;
 use File::MimeInfo;
 use Encode;
 
 # This is a wrapper around the real writefile.

-sub writefile ($$$;$$) { #{{{
+sub writefile ($$$;$$) {

         my $file=shift;
         my $destdir=shift;
         my $content=shift;
         my $file=shift;
         my $destdir=shift;
         my $content=shift;


@@ -131,7 +201,6 @@ sub writefile ($$$;$$) { #{{{
                # TODO: investigate using the new copy operation.
                #       (It may not be robust enough.)
                foreach my $key (@keys) {
                # 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);
                        my $res;
                        if (! $writer) {
                                $res=$bucket->add_key($key, $content, \%opts);


@@ -156,10 +225,10 @@ sub writefile ($$$;$$) { #{{{
        }
 
        return $ret;
        }
 
        return $ret;

-} #}}}
+}

 
 # This is a wrapper around the real prune.
 
 # This is a wrapper around the real prune.

-sub prune ($) { #{{{
+sub prune ($) {

        my $file=shift;
 
        my @keys=IkiWiki::Plugin::amazon_s3::file2keys($file);
        my $file=shift;
 
        my @keys=IkiWiki::Plugin::amazon_s3::file2keys($file);


@@ -169,7 +238,6 @@ sub prune ($) { #{{{
                my $bucket=IkiWiki::Plugin::amazon_s3::getbucket();
 
                foreach my $key (@keys) {
                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: ").
                        my $res=$bucket->delete_key($key);
                        if (! $res) {
                                error(gettext("Failed to delete file from S3: ").


@@ -179,6 +247,6 @@ sub prune ($) { #{{{
        }
 
        return $IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::prune'}->($file);
        }
 
        return $IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::prune'}->($file);

-} #}}}
+}

 
 1
 
 1