X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f0090d8c5781682eb0e4a59cb92438c0b7baafa1..3de7d39ec6db4791f2b17c6242da9d380f67b701:/IkiWiki/Plugin/autoindex.pm

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 8179ee1e7..0e30b9900 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -7,9 +7,18 @@ use IkiWiki 2.00;
 use Encode;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "autoindex", call => \&getsetup);
 	hook(type => "refresh", id => "autoindex", call => \&refresh);
 } # }}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => 0,
+		},
+} #}}}
+
 sub genindex ($) { #{{{
 	my $page=shift;
 	my $file=$page.".".$config{default_pageext};
@@ -26,31 +35,34 @@ sub refresh () { #{{{
 	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;
+					}
 				}
 			}
-		}
-	}, $config{srcdir});
+		}, $dir);
+	}
 
 	my @needed;
 	foreach my $dir (keys %dirs) {
-		if (! exists $pages{$dir}) {
+		if (! exists $pages{$dir} && grep /^$dir\/.*/, keys %pages) {
 			push @needed, $dir;
 		}
 	}