aggregate: Allow expirecount to work on the first pass. (expireage still needs to...

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

diff --git a/IkiWiki/Plugin/rename.pm b/IkiWiki/Plugin/rename.pm
index 5fda526a89417635f548098b5f0c733b78e76230..77aed9556902d9344c85e0f5c7b0eedf180b0476 100644 (file)
--- a/IkiWiki/Plugin/rename.pm
+++ b/IkiWiki/Plugin/rename.pm
@@ -6,12 +6,21 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 use IkiWiki 2.00;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "rename", call => \&getsetup);

        hook(type => "formbuilder_setup", id => "rename", call => \&formbuilder_setup);
        hook(type => "formbuilder", id => "rename", call => \&formbuilder);
        hook(type => "sessioncgi", id => "rename", call => \&sessioncgi);
 
 } # }}}
 
        hook(type => "formbuilder_setup", id => "rename", call => \&formbuilder_setup);
        hook(type => "formbuilder", id => "rename", call => \&formbuilder);
        hook(type => "sessioncgi", id => "rename", call => \&sessioncgi);
 
 } # }}}
 

+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => 0,
+               },
+} #}}}
+

 sub check_canrename ($$$$$$$) { #{{{
        my $src=shift;
        my $srcfile=shift;
 sub check_canrename ($$$$$$$) { #{{{
        my $src=shift;
        my $srcfile=shift;


@@ -43,7 +52,7 @@ sub check_canrename ($$$$$$$) { #{{{
        
        # Dest checks can be omitted by passing undef.
        if (defined $dest) {
        
        # Dest checks can be omitted by passing undef.
        if (defined $dest) {

-               if ($src eq $dest || $srcfile eq $destfile) {
+               if ($srcfile eq $destfile) {

                        error(gettext("no change to the file name was specified"));
                }
 
                        error(gettext("no change to the file name was specified"));
                }
 


@@ -54,7 +63,7 @@ sub check_canrename ($$$$$$$) { #{{{
                }
 
                # Must not be a known source file.
                }
 
                # Must not be a known source file.

-               if (exists $pagesources{$dest}) {
+               if ($src ne $dest && exists $pagesources{$dest}) {

                        error(sprintf(gettext("%s already exists"),
                                htmllink("", "", $dest, noimageinline => 1)));
                }
                        error(sprintf(gettext("%s already exists"),
                                htmllink("", "", $dest, noimageinline => 1)));
                }


@@ -97,12 +106,30 @@ sub rename_form ($$$) { #{{{
        $f->field(name => "do", type => "hidden", value => "rename", force => 1);
        $f->field(name => "page", type => "hidden", value => $page, force => 1);
        $f->field(name => "new_name", value => IkiWiki::pagetitle($page), size => 60);
        $f->field(name => "do", type => "hidden", value => "rename", force => 1);
        $f->field(name => "page", type => "hidden", value => $page, force => 1);
        $f->field(name => "new_name", value => IkiWiki::pagetitle($page), size => 60);

+       if (!$q->param("attachment")) {
+               # insert the standard extensions
+               my @page_types;
+               if (exists $IkiWiki::hooks{htmlize}) {
+                       @page_types=grep { !/^_/ }
+                               keys %{$IkiWiki::hooks{htmlize}};
+               }
+       
+               # make sure the current extension is in the list
+               my ($ext) = $pagesources{$page}=~/\.([^.]+)$/;
+               if (! $IkiWiki::hooks{htmlize}{$ext}) {
+                       unshift(@page_types, $ext);
+               }
+       
+               $f->field(name => "type", type => 'select',
+                       options => \@page_types,
+                       value => $ext, force => 1);
+       }

        $f->field(name => "attachment", type => "hidden");
 
        return $f, ["Rename", "Cancel"];
 } #}}}
 
        $f->field(name => "attachment", type => "hidden");
 
        return $f, ["Rename", "Cancel"];
 } #}}}
 

-sub rename_start ($$$$) {
+sub rename_start ($$$$) { #{{{

        my $q=shift;
        my $session=shift;
        my $attachment=shift;
        my $q=shift;
        my $session=shift;
        my $attachment=shift;


@@ -127,9 +154,9 @@ sub rename_start ($$$$) {
        
        IkiWiki::showform($f, $buttons, $session, $q);
        exit 0;
        
        IkiWiki::showform($f, $buttons, $session, $q);
        exit 0;

-}
+} #}}}

 
 

-sub postrename ($;$$$) {
+sub postrename ($;$$$) { #{{{

        my $session=shift;
        my $src=shift;
        my $dest=shift;
        my $session=shift;
        my $src=shift;
        my $dest=shift;


@@ -160,7 +187,7 @@ sub postrename ($;$$$) {
        }
 
        IkiWiki::cgi_editpage($postrename, $session);
        }
 
        IkiWiki::cgi_editpage($postrename, $session);

-}
+} #}}}

 
 sub formbuilder (@) { #{{{
        my %params=@_;
 
 sub formbuilder (@) { #{{{
        my %params=@_;


@@ -222,13 +249,17 @@ sub sessioncgi ($$) { #{{{
                        my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src});
                        my $dest=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($q->param("new_name")));
 
                        my $srcfile=IkiWiki::possibly_foolish_untaint($pagesources{$src});
                        my $dest=IkiWiki::possibly_foolish_untaint(IkiWiki::titlepage($q->param("new_name")));
 

-                       # The extension of dest is the same as src if it's
-                       # a page. If it's an extension, the extension is
-                       # already included.

                        my $destfile=$dest;
                        if (! $q->param("attachment")) {
                        my $destfile=$dest;
                        if (! $q->param("attachment")) {

-                               my ($ext)=$srcfile=~/(\.[^.]+)$/;
-                               $destfile.=$ext;
+                               my $type=$q->param('type');
+                               if (defined $type && length $type && $IkiWiki::hooks{htmlize}{$type}) {
+                                       $type=IkiWiki::possibly_foolish_untaint($type);
+                               } else {
+                                       my ($ext)=$srcfile=~/\.([^.]+)$/;
+                                       $type=$ext;
+                               }
+                               
+                               $destfile.=".".$type;

                        }
 
                        check_canrename($src, $srcfile, $dest, $destfile,
                        }
 
                        check_canrename($src, $srcfile, $dest, $destfile,


@@ -243,7 +274,7 @@ sub sessioncgi ($$) { #{{{
                        if ($config{rcs}) {
                                IkiWiki::rcs_rename($srcfile, $destfile);
                                IkiWiki::rcs_commit_staged(
                        if ($config{rcs}) {
                                IkiWiki::rcs_rename($srcfile, $destfile);
                                IkiWiki::rcs_commit_staged(

-                                       sprintf(gettext("rename %s to %s"), $src, $dest),
+                                       sprintf(gettext("rename %s to %s"), $srcfile, $destfile),

                                        $session->param("name"), $ENV{REMOTE_ADDR});
                        }
                        else {
                                        $session->param("name"), $ENV{REMOTE_ADDR});
                        }
                        else {


@@ -252,31 +283,33 @@ sub sessioncgi ($$) { #{{{
                                }
                        }
                        my @fixedlinks;
                                }
                        }
                        my @fixedlinks;

-                       foreach my $page (keys %links) {
-                               my $needfix=0;
-                               foreach my $link (@{$links{$page}}) {
-                                       my $bestlink=bestlink($page, $link);
-                                       if ($bestlink eq $src) {
-                                               $needfix=1;
-                                               last;
+                       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;
+                                                       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"), $src, $dest),
-                                                       $token,
-                                                       $session->param("name"), 
-                                                       $ENV{REMOTE_ADDR}
-                                               );
-                                               push @fixedlinks, $page if ! defined $conflict;
+                                       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;
+                                               }

                                        }
                                }
                        }
                                        }
                                }
                        }


@@ -289,39 +322,44 @@ sub sessioncgi ($$) { #{{{
 
                        # Scan for any remaining broken links to $src.
                        my @brokenlinks;
 
                        # Scan for any remaining broken links to $src.
                        my @brokenlinks;

-                       foreach my $page (keys %links) {
-                               my $broken=0;
-                               foreach my $link (@{$links{$page}}) {
-                                       my $bestlink=bestlink($page, $link);
-                                       if ($bestlink eq $src) {
-                                               $broken=1;
-                                               last;
+                       if ($src ne $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;
+                                                       last;
+                                               }

                                        }
                                        }

+                                       push @brokenlinks, $page if $broken;

                                }
                                }

-                               push @brokenlinks, $page if $broken;

                        }
 
                        # Generate a rename summary, that will be shown at the top
                        # of the edit template.
                        my $template=template("renamesummary.tmpl");
                        }
 
                        # Generate a rename summary, that will be shown at the top
                        # of the edit template.
                        my $template=template("renamesummary.tmpl");

-                       $template->param(src => $src);
-                       $template->param(dest => $dest);
-                       $template->param(brokenlinks => [
-                               map {
-                                       {
-                                               page => htmllink($dest, $dest, $_,
-                                                               noimageinline => 1)
-                                       }
-                               } @brokenlinks
-                       ]);
-                       $template->param(fixedlinks => [
-                               map {
-                                       {
-                                               page => htmllink($dest, $dest, $_,
-                                                               noimageinline => 1)
-                                       }
-                               } @fixedlinks
-                       ]);
+                       $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=$template->output;
 
                        postrename($session, $src, $dest, $q->param("attachment"));
                        $renamesummary=$template->output;
 
                        postrename($session, $src, $dest, $q->param("attachment"));