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

simplify key determination code

master
Joey Hess 2008-05-08 13:00:05 -04:00
parent 57cf8ef4f2
commit 8861af53db
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IkiWiki/Plugin/amazon_s3.pm
View File

@ -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: ").