1 files changed, 75 insertions, 34 deletions

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index bbf8f915e..03b2910fd 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -43,7 +43,7 @@ sub backlinks ($) {
 	my @links;
 	foreach my $p (backlink_pages($page)) {
 		my $href=urlto($p, $page);
-                
+
 		# Trim common dir prefixes from both pages.
 		my $p_trimmed=$p;
 		my $page_trimmed=$page;
@@ -281,6 +281,26 @@ sub srcdir_check () {
 	
 }
 
+sub verify_src_file ($$) {
+	my $file=shift;
+	my $dir=shift;
+
+	return if -l $file || -d _;
+	$file=~s/^\Q$dir\E\/?//;
+	return if ! length $file;
+	my $page = pagename($file);
+	if (! exists $pagesources{$page} &&
+		file_pruned($file)) {
+		return;
+	}
+
+	my ($file_untainted) = $file =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file_untainted) {
+		warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
+	}
+	return ($file_untainted, $page);
+}
+
 sub find_src_files () {
 	my @files;
 	my %pages;
@@ -289,58 +309,38 @@ sub find_src_files () {
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			my $file=decode_utf8($_);
-			$file=~s/^\Q$config{srcdir}\E\/?//;
-			return if -l $_ || -d _ || ! length $file;
-			my $page = pagename($file);
-			if (! exists $pagesources{$page} &&
-			    file_pruned($file)) {
-				$File::Find::prune=1;
-				return;
-			}
-
-			my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-			if (! defined $f) {
-				warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-			}
-			else {
-				push @files, $f;
+			my ($file, $page) = verify_src_file(decode_utf8($_), $config{srcdir});
+			if (defined $file) {
+				push @files, $file;
 				if ($pages{$page}) {
 					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
 				}
 				$pages{$page}=1;
 			}
+			else {
+				$File::Find::prune=1;
+			}
 		},
 	}, $config{srcdir});
 	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				my $file=decode_utf8($_);
-				$file=~s/^\Q$dir\E\/?//;
-				return if -l $_ || -d _ || ! length $file;
-				my $page=pagename($file);
-				if (! exists $pagesources{$page} &&
-				    file_pruned($file)) {
-					$File::Find::prune=1;
-					return;
-				}
-
-				my ($f) = $file =~ /$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn(sprintf(gettext("skipping bad filename %s"), $file)."\n");
-				}
-				else {
+				my ($file, $page) = verify_src_file(decode_utf8($_), $dir);
+				if (defined $file) {
 					# avoid underlaydir override
 					# attacks; see security.mdwn
-					if (! -l "$config{srcdir}/$f" && 
+					if (! -l "$config{srcdir}/$file" &&
 					    ! -e _) {
 						if (! $pages{$page}) {
-							push @files, $f;
+							push @files, $file;
 							$pages{$page}=1;
 						}
 					}
 				}
+				else {
+					$File::Find::prune=1;
+				}
 			},
 		}, $dir);
 	};
@@ -686,6 +686,37 @@ sub render_backlinks ($) {
 	}
 }
 
+sub gen_autofile ($$$) {
+	my $autofile=shift;
+	my $pages=shift;
+	my $del=shift;
+	
+	if (srcfile($autofile, 1)) {
+		return 0;
+	}
+
+	my ($file, $page) = verify_src_file("$config{srcdir}/$autofile", $config{srcdir});
+	
+	if ((!defined $file) ||
+	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+		return 0;
+	}
+	
+	if ($pages->{$page}) {
+		return 0;
+	}
+
+	if (grep { $_ eq $file } @$del) {
+		$wikistate{$autofiles{$autofile}{generator}}{autofile_deleted}=1;
+		return 0;
+	}
+
+	$autofiles{$autofile}{generator}->();
+	$pages->{$page}=1;
+	return 1;
+}
+
+
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
@@ -700,6 +731,16 @@ sub refresh () {
 		scan($file);
 	}
 
+	foreach my $autofile (keys %autofiles) {
+		if (gen_autofile($autofile, $pages, $del)) {
+			push @{$files}, $autofile;
+			push @{$new}, $autofile if find_new_files([$autofile]);
+			push @{$changed}, $autofile if find_changed([$autofile]);
+			
+			scan($autofile);
+		}
+	}
+
 	calculate_links();
 	
 	remove_del(@$del, @$internal_del);