X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8f8bda1ae55632de4221859abd082ffe61c4a07d..034b4e826627dddf47ff27278897804e39741e57:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 1114e05c8..14f6f9d5f 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;
@@ -286,63 +286,54 @@ sub find_src_files () {
 	my %pages;
 	eval q{use File::Find};
 	error($@) if $@;
-	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;
-				if ($pages{$page}) {
-					debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+	my ($page, $dir, $underlay);
+	my $helper=sub {
+		my $file=decode_utf8($_);
+
+		return if -l $file || -d _;
+		$file=~s/^\Q$dir\E\/?//;
+		return if ! length $file;
+		$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");
+		}
+	
+		if ($underlay) {
+			# avoid underlaydir override attacks; see security.mdwn
+			if (! -l "$config{srcdir}/$f" && ! -e _) {
+				if (! $pages{$page}) {
+					push @files, $f;
+					$pages{$page}=1;
 				}
-				$pages{$page}=1;
 			}
-		},
-	}, $config{srcdir});
-	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+		}
+		else {
+			push @files, $f;
+			if ($pages{$page}) {
+				debug(sprintf(gettext("%s has multiple possible source pages"), $page));
+			}
+			$pages{$page}=1;
+		}
+	};
+
+	find({
+		no_chdir => 1,
+		wanted => $helper,
+	}, $dir=$config{srcdir});
+	$underlay=1;
+	foreach (@{$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 {
-					# avoid underlaydir override
-					# attacks; see security.mdwn
-					if (! -l "$config{srcdir}/$f" && 
-					    ! -e _) {
-						if (! $pages{$page}) {
-							push @files, $f;
-							$pages{$page}=1;
-						}
-					}
-				}
-			},
-		}, $dir);
+			wanted => $helper,
+		}, $dir=$_);
 	};
 	return \@files, \%pages;
 }
@@ -431,7 +422,7 @@ sub remove_del (@) {
 	foreach my $file (@_) {
 		my $page=pagename($file);
 		if (! isinternal($page)) {
-			debug(sprintf(gettext("removing old page %s"), $page));
+			debug(sprintf(gettext("removing obsolete %s"), $page));
 		}
 	
 		foreach my $old (@{$oldrenderedfiles{$page}}) {
@@ -634,34 +625,35 @@ sub render_dependent ($$$$$$$) {
 							if ($type == $IkiWiki::DEPEND_LINKS) {
 								next unless $linkchangers->{lc($page)};
 							}
-							return $page;
+							$reason=$page;
+							return 1;
 						}
 					}
 					return undef;
 				};
 
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
-					last if $reason =
-						$in->(\@changed, $IkiWiki::DEPEND_CONTENT);
-					last if $internal_dep && ($reason =
+					last if $in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
 						$in->($internal_del, $IkiWiki::DEPEND_CONTENT) ||
-						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT));
+						$in->($internal_changed, $IkiWiki::DEPEND_CONTENT)
+					);
 				}
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_PRESENCE) {
-					last if $reason = 
-						$in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
-					last if $internal_dep && ($reason =
+					last if $in->(\@exists_changed, $IkiWiki::DEPEND_PRESENCE);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_PRESENCE) ||
-						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE));
+						$in->($internal_del, $IkiWiki::DEPEND_PRESENCE)
+					);
 				}
 				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_LINKS) {
-					last if $reason =
-						$in->(\@changed, $IkiWiki::DEPEND_LINKS);
-					last if $internal_dep && ($reason =
+					last if $in->(\@changed, $IkiWiki::DEPEND_LINKS);
+					last if $internal_dep && (
 						$in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
 						$in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
-						$in->($internal_changed, $IkiWiki::DEPEND_LINKS));
+						$in->($internal_changed, $IkiWiki::DEPEND_LINKS)
+					);
 				}
 			}
 		}
@@ -685,6 +677,41 @@ sub render_backlinks ($) {
 	}
 }
 
+sub gen_autofile ($$$) {
+	my $autofile=shift;
+	my $pages=shift;
+	my $del=shift;
+	
+	if (srcfile($autofile, 1) || file_pruned($autofile)) {
+		return;
+	}
+	
+	my $file="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file || -l $file || -d _ || -e _) {
+		return;
+	}
+
+	if ((!defined $file) ||
+	    (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted})) {
+		return;
+	}
+	
+	my $page = pagename($file);
+	if ($pages->{$page}) {
+		return;
+	}
+
+	if (grep { $_ eq $file } @$del) {
+		$wikistate{$autofiles{$autofile}{plugin}}{autofile_deleted}=1;
+		return;
+	}
+
+	$autofiles{$autofile}{generator}->();
+	$pages->{$page}=1;
+	return 1;
+}
+
+
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
@@ -699,6 +726,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);