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 8179ee1e72a28ba5dac9dc6911cf35b2477ac7bf..d1b3edb1f3cb6394d6bda558aed507fee627b4c3 100644 (file)
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -7,12 +7,21 @@ use IkiWiki 2.00;
 use Encode;
 
 sub import { #{{{
 use Encode;
 
 sub import { #{{{

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

        hook(type => "refresh", id => "autoindex", call => \&refresh);
 } # }}}
 
        hook(type => "refresh", id => "autoindex", call => \&refresh);
 } # }}}
 

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

 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);


@@ -26,32 +35,61 @@ sub refresh () { #{{{
        error($@) if $@;
 
        my (%pages, %dirs);
        error($@) if $@;
 
        my (%pages, %dirs);

-       find({
-               no_chdir => 1,
-               wanted => sub {
-                       $_=decode_utf8($_);
-                       if (IkiWiki::file_pruned($_, $config{srcdir})) {
-                               $File::Find::prune=1;
-                       }
-                       elsif (! -l $_) {
-                               my ($f)=/$config{wiki_file_regexp}/; # untaint
-                               return unless defined $f;
-                               $f=~s/^\Q$config{srcdir}\E\/?//;
-                               return unless length $f;
-                               if (! -d _) {
-                                       $pages{pagename($f)}=1;
+       foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
+               find({
+                       no_chdir => 1,
+                       wanted => sub {
+                               $_=decode_utf8($_);
+                               if (IkiWiki::file_pruned($_, $dir)) {
+                                       $File::Find::prune=1;

                                }
                                }

-                               else {
-                                       $dirs{$f}=1;
+                               elsif (! -l $_) {
+                                       my ($f)=/$config{wiki_file_regexp}/; # untaint
+                                       return unless defined $f;
+                                       $f=~s/^\Q$dir\E\/?//;
+                                       return unless length $f;
+                                       return if $f =~ /\._([^.]+)$/; # skip internal page
+                                       if (! -d _) {
+                                               $pages{pagename($f)}=1;
+                                       }
+                                       elsif ($dir eq $config{srcdir}) {
+                                               $dirs{$f}=1;
+                                       }

                                }
                        }
                                }
                        }

+               }, $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};
+                       }

                }
                }

-       }, $config{srcdir});
+               $pagestate{index}{autoindex}{deleted}=\%deleted;
+       }

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

-               if (! exists $pages{$dir}) {
-                       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;
+                       }

                }
        }
        
                }
        }
        


@@ -59,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"),