fix bugs in `find_src_files()`.

[ikiwiki.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 44b2fb9c235f0c1d81b04cf054074661d30dfcd3..5b72b6de1665a26d319aa3ee2664ad05a409a45b 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -284,7 +284,7 @@ sub verify_src_file ($$) {
        my $file=decode_utf8(shift);
        my $dir=shift;
 
-       return if -l $file || -d $file;
+       return if -l $file || -d _;
        $file=~s/^\Q$dir\E\/?//;
        return if ! length $file;
        my $page = pagename($file);
@@ -294,11 +294,11 @@ sub verify_src_file ($$) {
                return;
        }
 
-       my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-       if (! defined $f) {
+       my ($file_untainted) = $file =~ /$config{wiki_file_regexp}/; # untaint
+       if (! defined $file_untainted) {
                warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
        }
-       return ($file,$page,$f);
+       return ($file_untainted, $page);
 }
 
 sub find_src_files () {
@@ -309,8 +309,8 @@ sub find_src_files () {
        find({
                no_chdir => 1,
                wanted => sub {
-                       my ($file,$page,$f) = verify_src_file($_,$config{srcdir});
-                       if ($file) {
+                       my ($file, $page) = verify_src_file($_, $config{srcdir});
+                       if (defined $file) {
                                push @files, $file;
                                if ($pages{$page}) {
                                        debug(sprintf(gettext("%s has multiple possible source pages"), $page));
@@ -323,14 +323,14 @@ sub find_src_files () {
                find({
                        no_chdir => 1,
                        wanted => sub {
-                               my ($file,$page,$f) = verify_src_file($_,$dir);
-                               if ($f) {
+                               my ($file, $page) = verify_src_file($_, $dir);
+                               if (defined $file) {
                                        # avoid underlaydir override
                                        # attacks; see security.mdwn
-                                       if (! -l "$config{srcdir}/$f" &&
+                                       if (! -l "$config{srcdir}/$file" &&
                                            ! -e _) {
                                                if (! $pages{$page}) {
-                                                       push @files, $f;
+                                                       push @files, $file;
                                                        $pages{$page}=1;
                                                }
                                        }
@@ -392,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;
                }
@@ -642,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);