X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9cb415f4a455c43bec9f4b9036090124e8fe15ec..98f0d672dfcbc178b80a2d5f9a8b2f2633c8f039:/IkiWiki/Plugin/autoindex.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/autoindex.pm b/IkiWiki/Plugin/autoindex.pm
index 0e30b9900..555856b11 100644
--- a/IkiWiki/Plugin/autoindex.pm
+++ b/IkiWiki/Plugin/autoindex.pm
@@ -3,34 +3,34 @@ 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 $@;
 
@@ -59,11 +59,37 @@ sub refresh () { #{{{
 			}
 		}, $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};
+			}
+		}
+		$pagestate{index}{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 $pagestate{index}{autoindex}{deleted}) {
+					$pagestate{index}{autoindex}{deleted}={};
+				}
+				${$pagestate{index}{autoindex}{deleted}}{$dir}=1;
+			}
+			else {
+				push @needed, $dir;
+			}
 		}
 	}
 	
@@ -71,7 +97,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 +107,6 @@ sub refresh () { #{{{
 			IkiWiki::enable_commit_hook();
 		}
 	}
-} #}}}
+}
 
 1