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

factor out do_rename

master
Joey Hess 2008-09-23 17:04:01 -04:00
parent 9cbc46f49a
commit 9b57602394
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
IkiWiki/Plugin/rename.pm
View File

@ -273,23 +273,13 @@ sub sessioncgi ($$) { #{{{
check_canrename($src, $srcfile, $dest, $destfile, check_canrename($src, $srcfile, $dest, $destfile,
$q, $session, $q->param("attachment")); $q, $session, $q->param("attachment"));
# Ensures that the dest directory exists and is ok. # Begin renaming process, which will end with a
IkiWiki::prep_writefile($destfile, $config{srcdir}); # wiki refresh.
# Do rename, update other pages, and refresh site.
IkiWiki::disable_commit_hook() if $config{rcs};
require IkiWiki::Render; require IkiWiki::Render;
if ($config{rcs}) { IkiWiki::disable_commit_hook() if $config{rcs};
IkiWiki::rcs_rename($srcfile, $destfile);
IkiWiki::rcs_commit_staged( do_rename($srcfile, $destfile, $session);
sprintf(gettext("rename %s to %s"), $srcfile, $destfile),
$session->param("name"), $ENV{REMOTE_ADDR});
}
else {
if (! rename("$config{srcdir}/$srcfile", "$config{srcdir}/$destfile")) {
error("rename: $!");
}
}
my @fixedlinks; my @fixedlinks;
if ($src ne $dest) { if ($src ne $dest) {
foreach my $page (keys %links) { foreach my $page (keys %links) {
@ -321,6 +311,8 @@ sub sessioncgi ($$) { #{{{
} }
} }
} }
# End renaming process and refresh wiki.
if ($config{rcs}) { if ($config{rcs}) {
IkiWiki::enable_commit_hook(); IkiWiki::enable_commit_hook();
IkiWiki::rcs_update(); IkiWiki::rcs_update();
@ -394,5 +386,26 @@ sub renamepage_hook ($$$$) { #{{{
return $content; return $content;
}# }}} }# }}}
sub do_rename ($$$) { #{{{
my $srcfile=shift;
my $destfile=shift;
my $session=shift;
# Actual file rename happens here.
# First, ensure that the dest directory exists and is ok.
IkiWiki::prep_writefile($destfile, $config{srcdir});
if ($config{rcs}) {
IkiWiki::rcs_rename($srcfile, $destfile);
IkiWiki::rcs_commit_staged(
sprintf(gettext("rename %s to %s"), $srcfile, $destfile),
$session->param("name"), $ENV{REMOTE_ADDR});
}
else {
if (! rename("$config{srcdir}/$srcfile", "$config{srcdir}/$destfile")) {
error("rename: $!");
}
}
} # }}}
1 1