X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/577eed0e7efaf1844d5e3f18a95e699f1bc831c5..11fc28970b329334d88d3667e5b55e0d57e353ab:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index c07be98f8..0889fed62 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,9 +7,7 @@ use strict;
 use IkiWiki;
 use Encode;
 
-my (%backlinks, %rendered, @new, @del, @internal, @internal_change, @files,
-	%page_exists, %oldlink_targets, @needsbuild, %backlinkchanged,
-	%linkchangers);
+my (%backlinks, %rendered);
 our %brokenlinks;
 my $links_calculated=0;
 
@@ -280,30 +278,33 @@ sub srcdir_check () {
 }
 
 sub find_src_files () {
-	my @ret;
+	my @files;
+	my %pages;
 	eval q{use File::Find};
 	error($@) if $@;
 	find({
 		no_chdir => 1,
 		wanted => sub {
-			$_=decode_utf8($_);
-			if (file_pruned($_, $config{srcdir})) {
+			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;
 			}
-			elsif (! -l $_ && ! -d _) {
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-				}
-				else {
-					$f=~s/^\Q$config{srcdir}\E\/?//;
-					push @ret, $f;
-					my $page = pagename($f);
-					if ($page_exists{$page}) {
-						debug(sprintf(gettext("%s has multiple possible source pages"), $page));
-					}
-					$page_exists{$page}=1;
+
+			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));
 				}
+				$pages{$page}=1;
 			}
 		},
 	}, $config{srcdir});
@@ -311,38 +312,43 @@ sub find_src_files () {
 		find({
 			no_chdir => 1,
 			wanted => sub {
-				$_=decode_utf8($_);
-				if (file_pruned($_, $dir)) {
+				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;
 				}
-				elsif (! -l $_ && ! -d _) {
-					my ($f)=/$config{wiki_file_regexp}/; # untaint
-					if (! defined $f) {
-						warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
-					}
-					else {
-						$f=~s/^\Q$dir\E\/?//;
-						# avoid underlaydir
-						# override attacks; see
-						# security.mdwn
-						if (! -l "$config{srcdir}/$f" && 
-						    ! -e _) {
-						    	my $page=pagename($f);
-							if (! $page_exists{$page}) {
-								push @ret, $f;
-								$page_exists{$page}=1;
-							}
+
+				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);
 	};
-	return \@ret;
+	return \@files, \%pages;
 }
 
-sub process_new_files () {
-	foreach my $file (@files) {
+sub find_new_files ($) {
+	my $files=shift;
+	my @new;
+	my @internal_new;
+
+	foreach my $file (@$files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
 			# the page has changed its type
@@ -351,7 +357,7 @@ sub process_new_files () {
 		$pagesources{$page}=$file;
 		if (! $pagemtime{$page}) {
 			if (isinternal($page)) {
-				push @internal, $file;
+				push @internal_new, $file;
 			}
 			else {
 				push @new, $file;
@@ -371,13 +377,19 @@ sub process_new_files () {
 			}
 		}
 	}
+
+	return \@new, \@internal_new;
 }
 
-sub process_del_files () {
+sub find_del_files ($) {
+	my $pages=shift;
+	my @del;
+	my @internal_del;
+
 	foreach my $page (keys %pagemtime) {
-		if (! $page_exists{$page}) {
+		if (! $pages->{$page}) {
 			if (isinternal($page)) {
-				push @internal, $pagesources{$page};
+				push @internal_del, $pagesources{$page};
 			}
 			else {
 				debug(sprintf(gettext("removing old page %s"), $page));
@@ -397,10 +409,15 @@ sub process_del_files () {
 			}
 		}
 	}
+
+	return \@del, \@internal_del;
 }
 
-sub find_needsbuild () {
-	foreach my $file (@files) {
+sub find_changed ($) {
+	my $files=shift;
+	my @changed;
+	my @internal_changed;
+	foreach my $file (@$files) {
 		my $page=pagename($file);
 		my ($srcfile, @stat)=srcfile_stat($file);
 		if (! exists $pagemtime{$page} ||
@@ -411,17 +428,20 @@ sub find_needsbuild () {
 			if (isinternal($page)) {
 				# Preprocess internal page in scan-only mode.
 				preprocess($page, $page, readfile($srcfile), 1);
-				push @internal_change, $file;
+				push @internal_changed, $file;
 			}
 			else {
-				push @needsbuild, $file;
+				push @changed, $file;
 			}
 		}
 	}
+	return \@changed, \@internal_changed;
 }
 
-sub calculate_old_links () {
-	foreach my $file (@needsbuild, @del) {
+sub calculate_old_links ($$) {
+	my ($changed, $del)=@_;
+	my %oldlink_targets;
+	foreach my $file (@$changed, @$del) {
 		my $page=pagename($file);
 		if (exists $oldlinks{$page}) {
 			foreach my $l (@{$oldlinks{$page}}) {
@@ -429,6 +449,7 @@ sub calculate_old_links () {
 			}
 		}
 	}
+	return \%oldlink_targets;
 }
 
 sub derender_internal ($) {
@@ -442,13 +463,12 @@ sub derender_internal ($) {
 	$renderedfiles{$page}=[];
 }
 
-sub render_linkers () {
-	foreach my $f (@new, @del) {
-		my $p=pagename($f);
-		foreach my $page (keys %{$backlinks{$p}}) {
-			my $file=$pagesources{$page};
-			render($file, sprintf(gettext("building %s, which links to %s"), $file, $p));
-		}
+sub render_linkers ($) {
+	my $f=shift;
+	my $p=pagename($f);
+	foreach my $page (keys %{$backlinks{$p}}) {
+		my $file=$pagesources{$page};
+		render($file, sprintf(gettext("building %s, which links to %s"), $file, $p));
 	}
 }
 
@@ -464,39 +484,48 @@ sub remove_unrendered () {
 	}
 }
 
-sub calculate_changed_links () {
-	foreach my $file (@needsbuild, @del) {
+sub calculate_changed_links ($$$) {
+	my ($changed, $del, $oldlink_targets)=@_;
+
+	my (%backlinkchanged, %linkchangers);
+
+	foreach my $file (@$changed, @$del) {
 		my $page=pagename($file);
-		my %link_targets;
+
 		if (exists $links{$page}) {
 			foreach my $l (@{$links{$page}}) {
 				my $target=bestlink($page, $l);
-				if (! exists $oldlink_targets{$page}{$l} ||
-				    $target ne $oldlink_targets{$page}{$l}) {
-					$backlinkchanged{$l}=1;
+				if (! exists $oldlink_targets->{$page}{$l} ||
+				    $target ne $oldlink_targets->{$page}{$l}) {
+					$backlinkchanged{$target}=1;
 					$linkchangers{lc($page)}=1;
 				}
-				delete $oldlink_targets{$page}{$l};
+				delete $oldlink_targets->{$page}{$l};
 			}
 		}
-		if (exists $oldlink_targets{$page} &&
-		    %{$oldlink_targets{$page}}) {
-			foreach my $target (keys %{$oldlink_targets{$page}}) {
+		if (exists $oldlink_targets->{$page} &&
+		    %{$oldlink_targets->{$page}}) {
+			foreach my $target (values %{$oldlink_targets->{$page}}) {
 				$backlinkchanged{$target}=1;
 			}
 			$linkchangers{lc($page)}=1;
 		}
 	}
+
+	return \%backlinkchanged, \%linkchangers;
 }
 
-sub render_dependent () {
-	my @changed=(keys %rendered, @del);
-	my @exists_changed=(@new, @del);
+sub render_dependent ($$$$$$$) {
+	my ($files, $new, $internal_new, $del, $internal_del,
+		$internal_changed, $linkchangers)=@_;
+
+	my @changed=(keys %rendered, @$del);
+	my @exists_changed=(@$new, @$del);
 	
 	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
 	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
 	 
-	foreach my $f (@files) {
+	foreach my $f (@$files) {
 		next if $rendered{$f};
 		my $p=pagename($f);
 		my $reason = undef;
@@ -510,7 +539,7 @@ sub render_dependent () {
 				     $lc_exists_changed{$d})
 			     	    ||
 				    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
-				     $linkchangers{$d})
+				     $linkchangers->{$d})
 		     		) {
 					$reason = $d;
 					last;
@@ -519,37 +548,53 @@ sub render_dependent () {
 		}
 	
 		if (exists $depends{$p} && ! defined $reason) {
-			D: foreach my $d (keys %{$depends{$p}}) {
-				my $sub=pagespec_translate($d);
+			foreach my $dep (keys %{$depends{$p}}) {
+				my $sub=pagespec_translate($dep);
 				next if $@ || ! defined $sub;
 
 				# only consider internal files
 				# if the page explicitly depends
 				# on such files
-				my $internal_dep=$d =~ /internal\(/;
-
-				my @candidates;
-				if ($depends{$p}{$d} & $IkiWiki::DEPEND_PRESENCE) {
-					@candidates=@exists_changed;
- 					push @candidates, @internal
-						if $internal_dep;
-				}
-				if (($depends{$p}{$d} & ($IkiWiki::DEPEND_CONTENT | $IkiWiki::DEPEND_LINKS))) {
-					@candidates=@changed;
-					push @candidates, @internal, @internal_change
-						if $internal_dep;
-				}
-
-				foreach my $file (@candidates) {
-					next if $file eq $f;
-					my $page=pagename($file);
-					if ($sub->($page, location => $p)) {
-						if ($depends{$p}{$d} & $IkiWiki::DEPEND_LINKS) {
-							next unless $linkchangers{lc($page)};
+				my $internal_dep=$dep =~ /internal\(/;
+
+				my $in=sub {
+					my $list=shift;
+					my $type=shift;
+					foreach my $file (@$list) {
+						next if $file eq $f;
+						my $page=pagename($file);
+						if ($sub->($page, location => $p)) {
+							if ($type == $IkiWiki::DEPEND_LINKS) {
+								next unless $linkchangers->{lc($page)};
+							}
+							return $page;
 						}
-						$reason = $page;
-						last D;
 					}
+					return undef;
+				};
+
+				if ($depends{$p}{$dep} & $IkiWiki::DEPEND_CONTENT) {
+					last if $reason =
+						$in->(\@changed, $IkiWiki::DEPEND_CONTENT);
+					last if $internal_dep && ($reason =
+						$in->($internal_new, $IkiWiki::DEPEND_CONTENT) ||
+						$in->($internal_del, $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 =
+						$in->($internal_new, $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 =
+						$in->($internal_new, $IkiWiki::DEPEND_LINKS) ||
+						$in->($internal_del, $IkiWiki::DEPEND_LINKS) ||
+						$in->($internal_changed, $IkiWiki::DEPEND_LINKS));
 				}
 			}
 		}
@@ -563,8 +608,9 @@ sub render_dependent () {
 	return 0;
 }
 
-sub render_backlinks () {
-	foreach my $link (keys %backlinkchanged) {
+sub render_backlinks ($) {
+	my $backlinkchanged=shift;
+	foreach my $link (keys %$backlinkchanged) {
 		my $linkfile=$pagesources{$link};
 		if (defined $linkfile) {
 			render($linkfile, sprintf(gettext("building %s, to update its backlinks"), $linkfile));
@@ -575,39 +621,45 @@ sub render_backlinks () {
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
-	@files=@{find_src_files()};
-	process_new_files();
-	process_del_files();
-	find_needsbuild();
-	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
-	calculate_old_links();
-
-	foreach my $file (@needsbuild) {
+	my ($files, $pages)=find_src_files();
+	my ($new, $internal_new)=find_new_files($files);
+	my ($del, $internal_del)=find_del_files($pages);
+	my ($changed, $internal_changed)=find_changed($files);
+	run_hooks(needsbuild => sub { shift->($changed) });
+	my $oldlink_targets=calculate_old_links($changed, $del);
+
+	foreach my $file (@$changed) {
 		scan($file);
 	}
 
 	calculate_links();
 
-	foreach my $file (@needsbuild) {
+	foreach my $file (@$changed) {
 		render($file, sprintf(gettext("building %s"), $file));
 	}
-
-	foreach my $file (@internal, @internal_change) {
+	foreach my $file (@$internal_new, @$internal_del, @$internal_changed) {
 		derender_internal($file);
 	}
+
+	my ($backlinkchanged, $linkchangers)=calculate_changed_links($changed,
+		$del, $oldlink_targets);
+
+	foreach my $file (@$new, @$del) {
+		render_linkers($file);
+	}
 	
-	calculate_changed_links();
-	render_linkers();
-	
-	if (@needsbuild || @del || @internal || @internal_change) {
-		1 while render_dependent();
+	if (@$changed || @$internal_changed ||
+	    @$del || @$internal_del || @$internal_new) {
+		1 while render_dependent($files, $new, $internal_new,
+			$del, $internal_del, $internal_changed,
+			$linkchangers);
 	}
 
-	render_backlinks();
+	render_backlinks($backlinkchanged);
 	remove_unrendered();
 
-	if (@del) {
-		run_hooks(delete => sub { shift->(@del) });
+	if (@$del) {
+		run_hooks(delete => sub { shift->(@$del) });
 	}
 	if (%rendered) {
 		run_hooks(change => sub { shift->(keys %rendered) });