]> sipb.mit.edu Git - ikiwiki.git/commitdiff
autoindex: Ignore internal pages, and take underlay directories into account. Also...
authorJoey Hess <joey@kodama.kitenet.net>
Wed, 6 Aug 2008 04:04:05 +0000 (00:04 -0400)
committerJoey Hess <joey@kodama.kitenet.net>
Wed, 6 Aug 2008 04:04:05 +0000 (00:04 -0400)
IkiWiki/Plugin/autoindex.pm
debian/changelog

index ef22ec8a3e9a244d0a4fbd7cf2471827f6f55599..0e30b9900e1ea3011789ddc6561961d610208773 100644 (file)
@@ -35,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;
                }
        }
index 5361d88f7a7bdff243bc2c8d62100574ec6c13f4..47af180c2003b096087ef76a7c1e17de64893dfc 100644 (file)
@@ -20,6 +20,9 @@ ikiwiki (2.60) UNRELEASED; urgency=low
   * Clarify some wording in the setup documentation that could maybe lead
     users to putting paths with "~/" in the setup file, which doesn't work.
     Closes: #493835
+  * autoindex: Ignore internal pages, and take underlay directories into
+    account. Also, avoid making index pages for directories that contain
+    no files.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400