Export add_autofile() for use in Plugins.

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

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index dec9293adcf25d6c8531d46e11a6068fa0676b71..d2fa80fbb8fa5f1678627415548fa474ad11d0b0 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -78,11 +78,14 @@ sub genpage ($$) {
        my $actions=0;
 
        if (length $config{cgiurl}) {
-               $template->param(editurl => cgiurl(do => "edit", page => $page))
-                       if IkiWiki->can("cgi_editpage");
-               $template->param(prefsurl => cgiurl(do => "prefs"))
-                       if exists $hooks{auth};
-               $actions++;
+               if (IkiWiki->can("cgi_editpage")) {
+                       $template->param(editurl => cgiurl(do => "edit", page => $page));
+                       $actions++;
+               }
+               if (exists $hooks{auth}) {
+                       $template->param(prefsurl => cgiurl(do => "prefs"));
+                       $actions++;
+               }
        }
                
        if (defined $config{historyurl} && length $config{historyurl}) {
@@ -92,7 +95,7 @@ sub genpage ($$) {
                $actions++;
        }
        if ($config{discussion}) {
-               if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+               if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
                   (length $config{cgiurl} ||
                    exists $links{$page."/".$config{discussionpage}})) {
                        $template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
@@ -277,6 +280,27 @@ sub srcdir_check () {
        
 }
 
+sub verify_src_file ($$) {
+       my $file=decode_utf8(shift);
+       my $dir=shift;
+
+       return if -l $file || -d $file;
+       $file=~s/^\Q$dir\E\/?//;
+       return if ! length $file;
+       my $page = pagename($file);
+       if (! exists $pagesources{$page} &&
+               file_pruned($file)) {
+               $File::Find::prune=1;
+               return;
+       }
+
+       my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
+       if (! defined $f) {
+               warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+       }
+       return ($file,$page,$f);
+}
+
 sub find_src_files () {
        my @files;
        my %pages;
@@ -285,22 +309,9 @@ sub find_src_files () {
        find({
                no_chdir => 1,
                wanted => sub {
-                       my $file=decode_utf8($_);
-                       $file=~s/^\Q$config{srcdir}\E\/?//;
-                       return if -l $_ || -d _ || ! length $file;
-                       my $page = pagename($file);
-                       if (! exists $pagesources{$page} &&
-                           file_pruned($file)) {
-                               $File::Find::prune=1;
-                               return;
-                       }
-
-                       my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-                       if (! defined $f) {
-                               warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-                       }
-                       else {
-                               push @files, $f;
+                       my ($file,$page,$f) = verify_src_file($_,$config{srcdir});
+                       if ($file) {
+                               push @files, $file;
                                if ($pages{$page}) {
                                        debug(sprintf(gettext("%s has multiple possible source pages"), $page));
                                }
@@ -312,24 +323,11 @@ sub find_src_files () {
                find({
                        no_chdir => 1,
                        wanted => sub {
-                               my $file=decode_utf8($_);
-                               $file=~s/^\Q$dir\E\/?//;
-                               return if -l $_ || -d _ || ! length $file;
-                               my $page=pagename($file);
-                               if (! exists $pagesources{$page} &&
-                                   file_pruned($file)) {
-                                       $File::Find::prune=1;
-                                       return;
-                               }
-
-                               my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-                               if (! defined $f) {
-                                       warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-                               }
-                               else {
+                               my ($file,$page,$f) = verify_src_file($_,$dir);
+                               if ($f) {
                                        # avoid underlaydir override
                                        # attacks; see security.mdwn
-                                       if (! -l "$config{srcdir}/$f" && 
+                                       if (! -l "$config{srcdir}/$f" &&
                                            ! -e _) {
                                                if (! $pages{$page}) {
                                                        push @files, $f;
@@ -394,7 +392,9 @@ sub find_del_files ($) {
                        else {
                                push @del, $pagesources{$page};
                        }
+                       $dellinks{$page}= $links{$page};
                        $links{$page}=[];
+                       $delrenderedfiles{$page}= $renderedfiles{$page};
                        $renderedfiles{$page}=[];
                        $pagemtime{$page}=0;
                }
@@ -406,7 +406,7 @@ sub find_del_files ($) {
 sub remove_del (@) {
        foreach my $file (@_) {
                my $page=pagename($file);
-               if (isinternal($page)) {
+               if (! isinternal($page)) {
                        debug(sprintf(gettext("removing old page %s"), $page));
                }
        
@@ -644,6 +644,27 @@ sub refresh () {
                scan($file);
        }
 
+       my %del_hash = map {$_, 1} @$del;
+       while (my $autofile = shift (@autofiles)) {
+               my $page=pagename($autofile);
+    if (exists $del_hash{$page}) {
+                       $links{$page}= $dellinks{$page};
+                       $renderedfiles{$page}= $delrenderedfiles{$page};
+                       delete $del_hash{$page};
+               }
+               if ($pages->{$page}) {
+                       debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+               }
+               $pages->{$page}=1;
+
+               push @{$files}, $autofile;
+               push @{$new}, $autofile if find_new_files([$autofile]);
+               push @{$changed}, $autofile if find_changed([$autofile]);
+
+               scan($autofile);
+       }
+       $del = [keys %del_hash];
+
        calculate_links();
        
        remove_del(@$del, @$internal_del);