Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 0e30b9900e1ea3011789ddc6561961d610208773..d1b3edb1f3cb6394d6bda558aed507fee627b4c3 100644 (file)
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -21,7 +21,7 @@ sub getsetup () { #{{{
 
 sub genindex ($) { #{{{
        my $page=shift;
 
 sub genindex ($) { #{{{
        my $page=shift;

-       my $file=$page.".".$config{default_pageext};
+       my $file=newpagefile($page, $config{default_pageext});

        my $template=template("autoindex.tmpl");
        $template->param(page => $page);
        writefile($file, $config{srcdir}, $template->output);
        my $template=template("autoindex.tmpl");
        $template->param(page => $page);
        writefile($file, $config{srcdir}, $template->output);


@@ -59,11 +59,37 @@ sub refresh () { #{{{
                        }
                }, $dir);
        }
                        }
                }, $dir);
        }

+       
+       my %deleted;
+        if (ref $pagestate{index}{autoindex}{deleted}) {
+              %deleted=%{$pagestate{index}{autoindex}{deleted}};
+               foreach my $dir (keys %deleted) {
+                       # remove deleted page state if the deleted page is re-added,
+                       # or if all its subpages are deleted
+                       if ($deleted{$dir} && (exists $pages{$dir} ||
+                                              ! grep /^$dir\/.*/, keys %pages)) {
+                               delete $deleted{$dir};
+                       }
+               }
+               $pagestate{index}{autoindex}{deleted}=\%deleted;
+       }

 
        my @needed;
        foreach my $dir (keys %dirs) {
 
        my @needed;
        foreach my $dir (keys %dirs) {

-               if (! exists $pages{$dir} && grep /^$dir\/.*/, keys %pages) {
-                       push @needed, $dir;
+               if (! exists $pages{$dir} && ! $deleted{$dir} &&
+                   grep /^$dir\/.*/, keys %pages) {
+                       if (exists $IkiWiki::pagemtime{$dir}) {
+                               # This page must have just been deleted, so
+                               # don't re-add it. And remember it was
+                               # deleted.
+                               if (! ref $pagestate{index}{autoindex}{deleted}) {
+                                       $pagestate{index}{autoindex}{deleted}={};
+                               }
+                               ${$pagestate{index}{autoindex}{deleted}}{$dir}=1;
+                       }
+                       else {
+                               push @needed, $dir;
+                       }

                }
        }
        
                }
        }
        


@@ -71,7 +97,9 @@ sub refresh () { #{{{
                if ($config{rcs}) {
                        IkiWiki::disable_commit_hook();
                }
                if ($config{rcs}) {
                        IkiWiki::disable_commit_hook();
                }

-               genindex($_) foreach @needed;
+               foreach my $page (@needed) {
+                       genindex($page);
+               }

                if ($config{rcs}) {
                        IkiWiki::rcs_commit_staged(
                                gettext("automatic index generation"),
                if ($config{rcs}) {
                        IkiWiki::rcs_commit_staged(
                                gettext("automatic index generation"),