(no commit message)

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

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index d1b3edb1f3cb6394d6bda558aed507fee627b4c3..0dd76259e0e74483f408eaec88e1d213aae45f79 100644 (file)
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -3,23 +3,23 @@ package IkiWiki::Plugin::autoindex;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 use Encode;
 
 use Encode;
 

-sub import { #{{{
+sub import {

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

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => 0,
                },
        return
                plugin => {
                        safe => 1,
                        rebuild => 0,
                },

-} #}}}
+}

 
 

-sub genindex ($) { #{{{
+sub genindex ($) {

        my $page=shift;
        my $file=newpagefile($page, $config{default_pageext});
        my $template=template("autoindex.tmpl");
        my $page=shift;
        my $file=newpagefile($page, $config{default_pageext});
        my $template=template("autoindex.tmpl");


@@ -28,26 +28,30 @@ sub genindex ($) { #{{{
        if ($config{rcs}) {
                IkiWiki::rcs_add($file);
        }
        if ($config{rcs}) {
                IkiWiki::rcs_add($file);
        }

-} #}}}
+}

 
 

-sub refresh () { #{{{
+sub refresh () {

        eval q{use File::Find};
        error($@) if $@;
 
        my (%pages, %dirs);
        foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {
        eval q{use File::Find};
        error($@) if $@;
 
        my (%pages, %dirs);
        foreach my $dir ($config{srcdir}, @{$config{underlaydirs}}, $config{underlaydir}) {

+               require File::Spec;
+               $dir=File::Spec->canonpath($dir);
+

                find({
                        no_chdir => 1,
                        wanted => sub {
                find({
                        no_chdir => 1,
                        wanted => sub {

-                               $_=decode_utf8($_);
-                               if (IkiWiki::file_pruned($_, $dir)) {
+                               my $file=File::Spec->canonpath(decode_utf8($_));
+                               return if $file eq $dir;
+                               $file=~s/^\Q$dir\E\/?//;
+                               return unless length $file;
+                               if (IkiWiki::file_pruned($file)) {

                                        $File::Find::prune=1;
                                }
                                elsif (! -l $_) {
                                        $File::Find::prune=1;
                                }
                                elsif (! -l $_) {

-                                       my ($f)=/$config{wiki_file_regexp}/; # untaint
+                                       my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint

                                        return unless defined $f;
                                        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;
                                        return if $f =~ /\._([^.]+)$/; # skip internal page
                                        if (! -d _) {
                                                $pages{pagename($f)}=1;


@@ -61,8 +65,16 @@ sub refresh () { #{{{
        }
        
        my %deleted;
        }
        
        my %deleted;

-        if (ref $pagestate{index}{autoindex}{deleted}) {
-              %deleted=%{$pagestate{index}{autoindex}{deleted}};
+       if (ref $wikistate{autoindex}{deleted}) {
+               %deleted=%{$wikistate{autoindex}{deleted}};
+       }
+        elsif (ref $pagestate{index}{autoindex}{deleted}) {
+               # compatability code
+               %deleted=%{$pagestate{index}{autoindex}{deleted}};
+               delete $pagestate{index}{autoindex};
+       }
+
+       if (keys %deleted) {

                foreach my $dir (keys %deleted) {
                        # remove deleted page state if the deleted page is re-added,
                        # or if all its subpages are deleted
                foreach my $dir (keys %deleted) {
                        # remove deleted page state if the deleted page is re-added,
                        # or if all its subpages are deleted


@@ -71,7 +83,7 @@ sub refresh () { #{{{
                                delete $deleted{$dir};
                        }
                }
                                delete $deleted{$dir};
                        }
                }

-               $pagestate{index}{autoindex}{deleted}=\%deleted;
+               $wikistate{autoindex}{deleted}=\%deleted;

        }
 
        my @needed;
        }
 
        my @needed;


@@ -82,10 +94,10 @@ sub refresh () { #{{{
                                # This page must have just been deleted, so
                                # don't re-add it. And remember it was
                                # deleted.
                                # 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}={};
+                               if (! ref $wikistate{autoindex}{deleted}) {
+                                       $wikistate{autoindex}{deleted}={};

                                }
                                }

-                               ${$pagestate{index}{autoindex}{deleted}}{$dir}=1;
+                               ${$wikistate{autoindex}{deleted}}{$dir}=1;

                        }
                        else {
                                push @needed, $dir;
                        }
                        else {
                                push @needed, $dir;


@@ -107,6 +119,6 @@ sub refresh () { #{{{
                        IkiWiki::enable_commit_hook();
                }
        }
                        IkiWiki::enable_commit_hook();
                }
        }

-} #}}}
+}

 
 1
 
 1