X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/96b1f9519270db39d4056878907dec2d6976fce4..e56ec7a96c3a2064941a82619bf6cb0d2e8392e0:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 5336d4f54..af24df155 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, %backlinkchanged,
-	%linkchangers);
+my (%backlinks, %rendered);
 our %brokenlinks;
 my $links_calculated=0;
 
@@ -63,6 +61,10 @@ sub backlinks ($) {
 sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
+	
+	run_hooks(postscan => sub {
+		shift->(page => $page, content => $content);
+	});
 
 	my $templatefile;
 	run_hooks(templatefile => sub {
@@ -76,11 +78,14 @@ sub genpage ($$) {
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
-		$template->param(editurl => cgiurl(do => "edit", page => $page))
-			if IkiWiki->can("cgi_editpage");
-		$template->param(prefsurl => cgiurl(do => "prefs"))
-			if exists $hooks{auth};
-		$actions++;
+		if (IkiWiki->can("cgi_editpage")) {
+			$template->param(editurl => cgiurl(do => "edit", page => $page));
+			$actions++;
+		}
+		if (exists $hooks{auth}) {
+			$template->param(prefsurl => cgiurl(do => "prefs"));
+			$actions++;
+		}
 	}
 		
 	if (defined $config{historyurl} && length $config{historyurl}) {
@@ -90,7 +95,7 @@ sub genpage ($$) {
 		$actions++;
 	}
 	if ($config{discussion}) {
-		if ($page !~ /.*\/\Q$config{discussionpage}\E$/ &&
+		if ($page !~ /.*\/\Q$config{discussionpage}\E$/i &&
 		   (length $config{cgiurl} ||
 		    exists $links{$page."/".$config{discussionpage}})) {
 			$template->param(discussionlink => htmllink($page, $page, $config{discussionpage}, noimageinline => 1, forcesubpage => 1));
@@ -132,10 +137,6 @@ sub genpage ($$) {
 	
 	$content=$template->output;
 	
-	run_hooks(postscan => sub {
-		shift->(page => $page, content => $content);
-	});
-
 	run_hooks(format => sub {
 		$content=shift->(
 			page => $page,
@@ -280,30 +281,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 +315,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 +360,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,37 +380,59 @@ 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));
 				push @del, $pagesources{$page};
 			}
 			$links{$page}=[];
 			$renderedfiles{$page}=[];
 			$pagemtime{$page}=0;
-			foreach my $old (@{$oldrenderedfiles{$page}}) {
-				prune($config{destdir}."/".$old);
-			}
-			delete $pagesources{$page};
-			foreach my $source (keys %destsources) {
-				if ($destsources{$source} eq $page) {
-					delete $destsources{$source};
-				}
+		}
+	}
+
+	return \@del, \@internal_del;
+}
+
+sub remove_del (@) {
+	foreach my $file (@_) {
+		my $page=pagename($file);
+		if (! isinternal($page)) {
+			debug(sprintf(gettext("removing old page %s"), $page));
+		}
+	
+		foreach my $old (@{$oldrenderedfiles{$page}}) {
+			prune($config{destdir}."/".$old);
+		}
+
+		foreach my $source (keys %destsources) {
+			if ($destsources{$source} eq $page) {
+				delete $destsources{$source};
 			}
 		}
+	
+		delete $pagecase{lc $page};
+		delete $pagesources{$page};
 	}
 }
 
-sub find_needsbuild () {
-	my @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} ||
@@ -412,24 +443,28 @@ 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 @needsbuild;
+	return \@changed, \@internal_changed;
 }
 
-sub calculate_old_links ($) {
-	my $file=shift;
-	my $page=pagename($file);
-	if (exists $oldlinks{$page}) {
-		foreach my $l (@{$oldlinks{$page}}) {
-			$oldlink_targets{$page}{$l}=bestlink($page, $l);
+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}}) {
+				$oldlink_targets{$page}{$l}=bestlink($page, $l);
+			}
 		}
 	}
+	return \%oldlink_targets;
 }
 
 sub derender_internal ($) {
@@ -464,37 +499,48 @@ sub remove_unrendered () {
 	}
 }
 
-sub calculate_changed_links ($) {
-	my $file=shift;
-	my $page=pagename($file);
-	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;
-				$linkchangers{lc($page)}=1;
+sub calculate_changed_links ($$$) {
+	my ($changed, $del, $oldlink_targets)=@_;
+
+	my (%backlinkchanged, %linkchangers);
+
+	foreach my $file (@$changed, @$del) {
+		my $page=pagename($file);
+
+		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{$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}}) {
-			$backlinkchanged{$target}=1;
+		if (exists $oldlink_targets->{$page} &&
+		    %{$oldlink_targets->{$page}}) {
+			foreach my $target (values %{$oldlink_targets->{$page}}) {
+				$backlinkchanged{$target}=1;
+			}
+			$linkchangers{lc($page)}=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;
@@ -508,7 +554,7 @@ sub render_dependent () {
 				     $lc_exists_changed{$d})
 			     	    ||
 				    ($depends_simple{$p}{$d} & $IkiWiki::DEPEND_LINKS &&
-				     $linkchangers{$d})
+				     $linkchangers->{$d})
 		     		) {
 					$reason = $d;
 					last;
@@ -517,37 +563,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));
 				}
 			}
 		}
@@ -561,8 +623,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));
@@ -573,53 +636,64 @@ sub render_backlinks () {
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
-	@files=@{find_src_files()};
-	process_new_files();
-	process_del_files();
-
-	my @needsbuild=find_needsbuild();
-	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
-
-	foreach my $file (@needsbuild, @del) {
-		calculate_old_links($file);
-	}
-
-	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();
+	
+	remove_del(@$del, @$internal_del);
 
-	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);
 	}
 
-	foreach my $file (@needsbuild, @del) {
-		calculate_changed_links($file);
-	}
+	my ($backlinkchanged, $linkchangers)=calculate_changed_links($changed,
+		$del, $oldlink_targets);
 
-	foreach my $file (@new, @del) {
+	foreach my $file (@$new, @$del) {
 		render_linkers($file);
 	}
 	
-	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) });
 	}
 }
 
+sub clean_rendered {
+	lockwiki();
+	loadindex();
+	remove_unrendered();
+	foreach my $page (keys %oldrenderedfiles) {
+		foreach my $file (@{$oldrenderedfiles{$page}}) {
+			prune($config{destdir}."/".$file);
+		}
+	}
+}
+
 sub commandline_render () {
 	lockwiki();
 	loadindex();