rename: implemented new canrename hook

[git.ikiwiki.info.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index fc1bc0c92649d7dca4a7095b57bc0f2be275ce67..8e4c8af71f8a2df4c0f59f0971309f76b040cd69 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,10 +7,10 @@ use strict;
 use IkiWiki;
 use Encode;
 
 use IkiWiki;
 use Encode;
 

-my %backlinks;
-my $backlinks_calculated=0;
+our %backlinks=();
+our $backlinks_calculated=0;

 
 

-sub calculate_backlinks () { #{{{
+sub calculate_backlinks () {

        return if $backlinks_calculated;
        %backlinks=();
        foreach my $page (keys %links) {
        return if $backlinks_calculated;
        %backlinks=();
        foreach my $page (keys %links) {


@@ -22,9 +22,9 @@ sub calculate_backlinks () { #{{{
                }
        }
        $backlinks_calculated=1;
                }
        }
        $backlinks_calculated=1;

-} #}}}
+}

 
 

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

        my $page=shift;
 
        calculate_backlinks();
        my $page=shift;
 
        calculate_backlinks();


@@ -45,9 +45,9 @@ sub backlinks ($) { #{{{
                push @links, { url => $href, page => pagetitle($p_trimmed) };
        }
        return @links;
                push @links, { url => $href, page => pagetitle($p_trimmed) };
        }
        return @links;

-} #}}}
+}

 
 

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

        my $page=shift;
        my $content=shift;
 
        my $page=shift;
        my $content=shift;
 


@@ -63,12 +63,13 @@ sub genpage ($$) { #{{{
        my $actions=0;
 
        if (length $config{cgiurl}) {
        my $actions=0;
 
        if (length $config{cgiurl}) {

-               $template->param(editurl => cgiurl(do => "edit", page => $page));
+               $template->param(editurl => cgiurl(do => "edit", page => $page))
+                       if IkiWiki->can("cgi_editpage");

                $template->param(prefsurl => cgiurl(do => "prefs"));
                $actions++;
        }
                
                $template->param(prefsurl => cgiurl(do => "prefs"));
                $actions++;
        }
                

-       if (length $config{historyurl}) {
+       if (defined $config{historyurl} && length $config{historyurl}) {

                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
                $template->param(historyurl => $u);
                my $u=$config{historyurl};
                $u=~s/\[\[file\]\]/$pagesources{$page}/g;
                $template->param(historyurl => $u);


@@ -130,9 +131,9 @@ sub genpage ($$) { #{{{
        });
 
        return $content;
        });
 
        return $content;

-} #}}}
+}

 
 

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

        my $file=shift;
 
        my $type=pagetype($file);
        my $file=shift;
 
        my $type=pagetype($file);


@@ -164,9 +165,9 @@ sub scan ($) { #{{{
        else {
                will_render($file, $file, 1);
        }
        else {
                will_render($file, $file, 1);
        }

-} #}}}
+}

 
 

-sub fast_file_copy (@) { #{{{
+sub fast_file_copy (@) {

        my $srcfile=shift;
        my $destfile=shift;
        my $srcfd=shift;
        my $srcfile=shift;
        my $destfile=shift;
        my $srcfd=shift;


@@ -190,7 +191,7 @@ sub fast_file_copy (@) { #{{{
        }
 }
 
        }
 }
 

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

        my $file=shift;
        
        my $type=pagetype($file);
        my $file=shift;
        
        my $type=pagetype($file);


@@ -232,9 +233,9 @@ sub render ($) { #{{{
                        fast_file_copy($srcfile, $file, $srcfd, @_);
                });
        }
                        fast_file_copy($srcfile, $file, $srcfd, @_);
                });
        }

-} #}}}
+}

 
 

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

        my $file=shift;
 
        unlink($file);
        my $file=shift;
 
        unlink($file);


@@ -242,14 +243,14 @@ sub prune ($) { #{{{
        while (rmdir($dir)) {
                $dir=dirname($dir);
        }
        while (rmdir($dir)) {
                $dir=dirname($dir);
        }

-} #}}}
+}

 
 

-sub refresh () { #{{{
-       # security check, avoid following symlinks in the srcdir path
+sub refresh () {
+       # security check, avoid following symlinks in the srcdir path by default

        my $test=$config{srcdir};
        while (length $test) {
        my $test=$config{srcdir};
        while (length $test) {

-               if (-l $test) {
-                       error("symlink found in srcdir path ($test)");
+               if (-l $test && ! $config{allow_symlinks_before_srcdir}) {
+                       error(sprintf(gettext("symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to allow this"), $test));

                }
                unless ($test=~s/\/+$//) {
                        $test=dirname($test);
                }
                unless ($test=~s/\/+$//) {
                        $test=dirname($test);


@@ -278,7 +279,11 @@ sub refresh () { #{{{
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
                                        push @files, $f;
                                else {
                                        $f=~s/^\Q$config{srcdir}\E\/?//;
                                        push @files, $f;

-                                       $exists{pagename($f)}=1;
+                                       my $pagename = pagename($f);
+                                       if ($exists{$pagename}) {
+                                               debug(sprintf(gettext("%s has multiple possible source pages"), $pagename));
+                                       }
+                                       $exists{$pagename}=1;

                                }
                        }
                },
                                }
                        }
                },


@@ -319,6 +324,10 @@ sub refresh () { #{{{
        # check for added or removed pages
        foreach my $file (@files) {
                my $page=pagename($file);
        # check for added or removed pages
        foreach my $file (@files) {
                my $page=pagename($file);

+               if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
+                       # the page has changed its type
+                       $forcerebuild{$page}=1;
+               }

                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
                        if (isinternal($page)) {
                $pagesources{$page}=$file;
                if (! $pagemtime{$page}) {
                        if (isinternal($page)) {


@@ -498,9 +507,9 @@ sub refresh () { #{{{
        if (%rendered) {
                run_hooks(change => sub { shift->(keys %rendered) });
        }
        if (%rendered) {
                run_hooks(change => sub { shift->(keys %rendered) });
        }

-} #}}}
+}

 
 

-sub commandline_render () { #{{{
+sub commandline_render () {

        lockwiki();
        loadindex();
        unlockwiki();
        lockwiki();
        loadindex();
        unlockwiki();


@@ -519,9 +528,10 @@ sub commandline_render () { #{{{
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $page, $type, $content);
        $pagemtime{$page}=(stat($srcfile))[9];
        $content=linkify($page, $page, $content);
        $content=htmlize($page, $page, $type, $content);
        $pagemtime{$page}=(stat($srcfile))[9];

+       $pagectime{$page}=$pagemtime{$page} if ! exists $pagectime{$page};

 
        print genpage($page, $content);
        exit 0;
 
        print genpage($page, $content);
        exit 0;

-} #}}}
+}

 
 1
 
 1