git: write proposed attachment to temp file without going via system()

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

diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm
index 93c10b629320bf78b5fc1d7e28df24598244f2a4..a9da6bf12b69dc62f2ee05f22aaaef2c88fe7dde 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;
 


@@ -133,7 +133,11 @@ sub getbucket {
        }
 
        if (! $bucket) {
        }
 
        if (! $bucket) {

-               error(gettext("Failed to create bucket in S3: ").
+               # Try to use existing bucket.
+               $bucket=$s3->bucket($config{amazon_s3_bucket});
+       }
+       if (! $bucket) {
+               error(gettext("Failed to create S3 bucket: ").

                        $s3->err.": ".$s3->errstr."\n");
        }
 
                        $s3->err.": ".$s3->errstr."\n");
        }
 


@@ -178,7 +182,7 @@ sub writefile ($$$;$$) {
 
        # First, write the file to disk.
        my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer);
 
        # First, write the file to disk.
        my $ret=$IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::writefile'}->($file, $destdir, $content, $binary, $writer);

-               
+

        my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file");
 
        # Store the data in S3.
        my @keys=IkiWiki::Plugin::amazon_s3::file2keys("$destdir/$file");
 
        # Store the data in S3.


@@ -228,8 +232,9 @@ sub writefile ($$$;$$) {
 }
 
 # This is a wrapper around the real prune.
 }
 
 # This is a wrapper around the real prune.

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

        my $file=shift;
        my $file=shift;

+       my $up_to=shift;

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


@@ -246,7 +251,7 @@ sub prune ($) {
                }
        }
 
                }
        }
 

-       return $IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::prune'}->($file);
+       return $IkiWiki::Plugin::amazon_s3::subs{'IkiWiki::prune'}->($file, $up_to);

 }
 
 1
 }
 
 1