diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-05-08 13:00:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-05-08 13:00:05 -0400 |
| commit | 8861af53dbf5fc8483780d3e70aa94b1b7631d9a (patch) | |
| tree | 8e79e543bc631f4d32dee2748afacda6ef949355 /IkiWiki | |
| parent | 57cf8ef4f205673ef5ac6129f810c971bcd4e5fa (diff) | |
| download | ikiwiki-8861af53dbf5fc8483780d3e70aa94b1b7631d9a.tar ikiwiki-8861af53dbf5fc8483780d3e70aa94b1b7631d9a.tar.gz | |
simplify key determination code
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/amazon_s3.pm | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/amazon_s3.pm b/IkiWiki/Plugin/amazon_s3.pm index f062a4295..cc15fbdb1 100644 --- a/IkiWiki/Plugin/amazon_s3.pm +++ b/IkiWiki/Plugin/amazon_s3.pm @@ -125,18 +125,20 @@ sub writefile ($$$;$$) { #{{{ # read back in the file that the writer emitted $res=$bucket->add_key_filename($key, "$destdir/$file", \%opts); } - if ($res && $key=~/(^|\/)index.$config{htmlext}$/) { + if ($res && $key=~/(^|.*\/)index.$config{htmlext}$/) { # index.html files are a special case. Since S3 is # not a normal web server, it won't serve up # foo/index.html when foo/ is requested. So the # file has to be stored twice. (This is bad news # when usedirs is enabled!) - $key=~s/index.$config{htmlext}$//; + # TODO: invesitgate using the new copy operation. + # (It may not be robust enough.) + my $base=$1; if (! $writer) { - $res=$bucket->add_key($key, $content, \%opts); + $res=$bucket->add_key($base, $content, \%opts); } else { - $res=$bucket->add_key_filename($key, "$destdir/$file", \%opts); + $res=$bucket->add_key_filename($base, "$destdir/$file", \%opts); } } if (! $res) { @@ -158,10 +160,9 @@ sub prune ($) { #{{{ my $key=$config{amazon_s3_prefix}.$1; my $bucket=IkiWiki::Plugin::amazon_s3::getbucket(); my $res=$bucket->delete_key($key); - if ($res && $key=~/(^|\/)index.$config{htmlext}$/) { + if ($res && $key=~/(^|.*\/)index.$config{htmlext}$/) { # index.html special case: Delete other file too - $key=~s/index.$config{htmlext}$//; - $res=$bucket->delete_key($key); + $res=$bucket->delete_key($1); } if (! $res) { error(gettext("Failed to delete file from S3: "). |