X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9cb415f4a455c43bec9f4b9036090124e8fe15ec..a0dbdcad77a97ab1219beeb8a92305538500ba3a:/IkiWiki/Plugin/autoindex.pm

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 0e30b9900..0dd76259e 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -3,51 +3,55 @@ package IkiWiki::Plugin::autoindex;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 use Encode;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "autoindex", call => \&getsetup);
 	hook(type => "refresh", id => "autoindex", call => \&refresh);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
 		plugin => {
 			safe => 1,
 			rebuild => 0,
 		},
-} #}}}
+}
 
-sub genindex ($) { #{{{
+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);
 	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}) {
+		require File::Spec;
+		$dir=File::Spec->canonpath($dir);
+
 		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 $_) {
-					my ($f)=/$config{wiki_file_regexp}/; # untaint
+					my ($f) = $file =~ /$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;
@@ -59,11 +63,45 @@ sub refresh () { #{{{
 			}
 		}, $dir);
 	}
+	
+	my %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
+			if ($deleted{$dir} && (exists $pages{$dir} ||
+			                       ! grep /^$dir\/.*/, keys %pages)) {
+				delete $deleted{$dir};
+			}
+		}
+		$wikistate{autoindex}{deleted}=\%deleted;
+	}
 
 	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 $wikistate{autoindex}{deleted}) {
+					$wikistate{autoindex}{deleted}={};
+				}
+				${$wikistate{autoindex}{deleted}}{$dir}=1;
+			}
+			else {
+				push @needed, $dir;
+			}
 		}
 	}
 	
@@ -71,7 +109,9 @@ sub refresh () { #{{{
 		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"),
@@ -79,6 +119,6 @@ sub refresh () { #{{{
 			IkiWiki::enable_commit_hook();
 		}
 	}
-} #}}}
+}
 
 1