diff options
| -rw-r--r-- | IkiWiki/Plugin/rename.pm | 256 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | templates/renamesummary.tmpl | 9 |
3 files changed, 188 insertions, 80 deletions
diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm index f441ac025..4ee377b86 100644 --- a/IkiWiki/Plugin/rename.pm +++ b/IkiWiki/Plugin/rename.pm @@ -129,6 +129,18 @@ sub rename_form ($$$) { #{{{ $f->field(name => "type", type => 'select', options => \@page_types, value => $ext, force => 1); + + foreach my $p (keys %pagesources) { + if ($pagesources{$p}=~m/^\Q$page\E\//) { + $f->field(name => "subpages", + label => "", + type => "checkbox", + options => [ [ 1 => gettext("Also rename SubPages and attachments") ] ], + value => 1, + force => 1); + last; + } + } } $f->field(name => "attachment", type => "hidden"); @@ -153,11 +165,10 @@ sub rename_start ($$$$) { #{{{ $session->param(postrename => scalar $q->Vars); IkiWiki::cgi_savesession($session); - my ($f, $buttons)=rename_form($q, $session, $page); if (defined $attachment) { - $f->field(name => "attachment", value => $attachment, force => 1); + $q->param(-name => "attachment", -value => $attachment); } - + my ($f, $buttons)=rename_form($q, $session, $page); IkiWiki::showform($f, $buttons, $session, $q); exit 0; } #}}} @@ -249,12 +260,14 @@ sub sessioncgi ($$) { #{{{ postrename($session); } elsif ($form->submitted eq 'Rename' && $form->validate) { + # Queue of rename actions to perfom. + my @torename; + # These untaints are safe because of the checks - # performed in check_canrename below. + # performed in check_canrename later. my $src=$q->param("page"); my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src}); my $dest=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($q->param("new_name"))); - my $destfile=$dest; if (! $q->param("attachment")) { my $type=$q->param('type'); @@ -268,58 +281,76 @@ sub sessioncgi ($$) { #{{{ $destfile.=".".$type; } - - check_canrename($src, $srcfile, $dest, $destfile, - $q, $session); - - # Ensures that the dest directory exists and is ok. - IkiWiki::prep_writefile($destfile, $config{srcdir}); - - # Do rename, update other pages, and refresh site. - IkiWiki::disable_commit_hook() if $config{rcs}; - require IkiWiki::Render; - 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}); + push @torename, { + src => $src, + srcfile => $srcfile, + dest => $dest, + destfile => $destfile, + required => 1, + }; + + # See if any subpages need to be renamed. + if ($q->param("subpages") && $src ne $dest) { + foreach my $p (keys %pagesources) { + if ($pagesources{$p}=~m/^\Q$src\E\//) { + my $d=$pagesources{$p}; + $d=~s/^\Q$src\E\//$dest\//; + push @torename, { + src => $p, + srcfile => $pagesources{$p}, + dest => pagename($d), + destfile => $d, + required => 0, + }; + } + } } - else { - if (! rename("$config{srcdir}/$srcfile", "$config{srcdir}/$destfile")) { - error("rename: $!"); + + require IkiWiki::Render; + IkiWiki::disable_commit_hook() if $config{rcs}; + my %origpagesources=%pagesources; + + # First file renaming. + foreach my $rename (@torename) { + if ($rename->{required}) { + do_rename($rename, $q, $session); + } + else { + eval {do_rename($rename, $q, $session)}; + if ($@) { + $rename->{error}=$@; + next; + } } + + # Temporarily tweak pagesources to point to + # the renamed file, in case fixlinks needs + # to edit it. + $pagesources{$rename->{src}}=$rename->{destfile}; } - my @fixedlinks; - if ($src ne $dest) { - foreach my $page (keys %links) { - my $needfix=0; - foreach my $link (@{$links{$page}}) { - my $bestlink=bestlink($page, $link); - if ($bestlink eq $src) { - $needfix=1; + IkiWiki::rcs_commit_staged( + sprintf(gettext("rename %s to %s"), $srcfile, $destfile), + $session->param("name"), $ENV{REMOTE_ADDR}) if $config{rcs}; + + # Then link fixups. + foreach my $rename (@torename) { + next if $rename->{src} eq $rename->{dest}; + next if $rename->{error}; + foreach my $p (fixlinks($rename, $session)) { + # map old page names to new + foreach my $r (@torename) { + next if $rename->{error}; + if ($r->{src} eq $p) { + $p=$r->{dest}; last; } } - if ($needfix) { - my $file=$pagesources{$page}; - my $oldcontent=readfile($config{srcdir}."/".$file); - my $content=renamepage_hook($page, $src, $dest, $oldcontent); - if ($oldcontent ne $content) { - my $token=IkiWiki::rcs_prepedit($file); - eval { writefile($file, $config{srcdir}, $content) }; - next if $@; - my $conflict=IkiWiki::rcs_commit( - $file, - sprintf(gettext("update for rename of %s to %s"), $srcfile, $destfile), - $token, - $session->param("name"), - $ENV{REMOTE_ADDR} - ); - push @fixedlinks, $page if ! defined $conflict; - } - } + push @{$rename->{fixedlinks}}, $p; } } + + # Then refresh. + %pagesources=%origpagesources; if ($config{rcs}) { IkiWiki::enable_commit_hook(); IkiWiki::rcs_update(); @@ -327,47 +358,51 @@ sub sessioncgi ($$) { #{{{ IkiWiki::refresh(); IkiWiki::saveindex(); - # Scan for any remaining broken links to $src. - my @brokenlinks; - if ($src ne $dest) { + # Find pages with remaining, broken links. + foreach my $rename (@torename) { + next if $rename->{src} eq $rename->{dest}; + foreach my $page (keys %links) { my $broken=0; foreach my $link (@{$links{$page}}) { my $bestlink=bestlink($page, $link); - if ($bestlink eq $src) { - $broken=1; + if ($bestlink eq $rename->{src}) { + push @{$rename->{brokenlinks}}, $page; last; } } - push @brokenlinks, $page if $broken; } } - # Generate a rename summary, that will be shown at the top + # Generate a summary, that will be shown at the top # of the edit template. - my $template=template("renamesummary.tmpl"); - $template->param(src => $srcfile); - $template->param(dest => $destfile); - if ($src ne $dest) { - $template->param(brokenlinks_checked => 1); - $template->param(brokenlinks => [ - map { - { - page => htmllink($dest, $dest, $_, - noimageinline => 1) - } - } @brokenlinks - ]); - $template->param(fixedlinks => [ - map { - { - page => htmllink($dest, $dest, $_, - noimageinline => 1) - } - } @fixedlinks - ]); + $renamesummary=""; + foreach my $rename (@torename) { + my $template=template("renamesummary.tmpl"); + $template->param(src => $rename->{srcfile}); + $template->param(dest => $rename->{destfile}); + $template->param(error => $rename->{error}); + if ($rename->{src} ne $rename->{dest}) { + $template->param(brokenlinks_checked => 1); + $template->param(brokenlinks => [ + map { + { + page => htmllink($rename->{dest}, $rename->{dest}, $_, + noimageinline => 1) + } + } @{$rename->{brokenlinks}} + ]); + $template->param(fixedlinks => [ + map { + { + page => htmllink($rename->{dest}, $rename->{dest}, $_, + noimageinline => 1) + } + } @{$rename->{fixedlinks}} + ]); + } + $renamesummary.=$template->output; } - $renamesummary=$template->output; postrename($session, $src, $dest, $q->param("attachment")); } @@ -393,5 +428,70 @@ sub renamepage_hook ($$$$) { #{{{ return $content; }# }}} + +sub do_rename ($$$) { #{{{ + my $rename=shift; + my $q=shift; + my $session=shift; + + # First, check if this rename is allowed. + check_canrename($rename->{src}, + $rename->{srcfile}, + $rename->{dest}, + $rename->{destfile}, + $q, $session); + + # Ensure that the dest directory exists and is ok. + IkiWiki::prep_writefile($rename->{destfile}, $config{srcdir}); + + if ($config{rcs}) { + IkiWiki::rcs_rename($rename->{srcfile}, $rename->{destfile}); + } + else { + if (! rename($config{srcdir}."/".$rename->{srcfile}, + $config{srcdir}."/".$rename->{destfile})) { + error("rename: $!"); + } + } + +} # }}} + +sub fixlinks ($$$) { #{{{ + my $rename=shift; + my $session=shift; + + my @fixedlinks; + + foreach my $page (keys %links) { + my $needfix=0; + foreach my $link (@{$links{$page}}) { + my $bestlink=bestlink($page, $link); + if ($bestlink eq $rename->{src}) { + $needfix=1; + last; + } + } + if ($needfix) { + my $file=$pagesources{$page}; + my $oldcontent=readfile($config{srcdir}."/".$file); + my $content=renamepage_hook($page, $rename->{src}, $rename->{dest}, $oldcontent); + if ($oldcontent ne $content) { + my $token=IkiWiki::rcs_prepedit($file); + eval { writefile($file, $config{srcdir}, $content) }; + next if $@; + my $conflict=IkiWiki::rcs_commit( + $file, + sprintf(gettext("update for rename of %s to %s"), $rename->{srcfile}, $rename->{destfile}), + $token, + $session->param("name"), + $ENV{REMOTE_ADDR} + ); + push @fixedlinks, $page if ! defined $conflict; + } + } + } + + return @fixedlinks; +} #}}} 1 diff --git a/debian/changelog b/debian/changelog index 372b585e6..1e03e41d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ ikiwiki (2.65) UNRELEASED; urgency=low * Add keepextension parameter to htmlize hook. (Willu) * rename, remove: Don't rely on a form parameter to tell whether the page should be treated as an attachment. + * rename: Add support for moving SubPages of a page when renaming it. + (Sponsored by The TOVA Company.) + * rename: Hide type field from rename form when renaming attachments. -- Joey Hess <joeyh@debian.org> Wed, 17 Sep 2008 14:26:56 -0400 diff --git a/templates/renamesummary.tmpl b/templates/renamesummary.tmpl index e165e81b3..60f81b35b 100644 --- a/templates/renamesummary.tmpl +++ b/templates/renamesummary.tmpl @@ -1,3 +1,9 @@ +<TMPL_IF ERROR> +<p> +<b>Failed to rename <TMPL_VAR SRC> to <TMPL_VAR DEST>: </b> +<TMPL_VAR ERROR> +</p> +<TMPL_ELSE> <p> <b>Successfully renamed <TMPL_VAR SRC> to <TMPL_VAR DEST>.</b> </p> @@ -14,8 +20,7 @@ The following pages still link to <TMPL_VAR SRC>: <ul> <TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP> </ul> -<TMPL_ELSE> -No pages have broken links to <TMPL_VAR SRC>. </TMPL_IF> </TMPL_IF> </p> +</TMPL_IF> |