X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ef7bddbc3693d7abf227100a9a9bc21d186dfada..bb7877707ef730c7fdab01509ac6a9cc9eb252d1:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 0fe20c64f..c9ba95363 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;
@@ -61,6 +61,10 @@ sub backlinks ($) {
 sub genpage ($$) {
 	my $page=shift;
 	my $content=shift;
+	
+	run_hooks(indexhtml => sub {
+		shift->(page => $page, destpage => $page, content => $content);
+	});
 
 	my $templatefile;
 	run_hooks(templatefile => sub {
@@ -70,15 +74,27 @@ sub genpage ($$) {
 			$templatefile=$file;
 		}
 	});
-	my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
+	my $template;
+	if (defined $templatefile) {
+		$template=template_depends($templatefile, $page,
+			blind_cache => 1);
+	}
+	else {
+		# no explicit depends as special case
+		$template=template('page.tmpl', 
+			blind_cache => 1);
+	}
 	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}) {
@@ -88,7 +104,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));
@@ -96,7 +112,14 @@ sub genpage ($$) {
 		}
 	}
 
-	if ($actions) {
+	my @actions;
+	run_hooks(pageactions => sub {
+		push @actions, map { { action => $_ } } 
+			grep { defined } shift->(page => $page);
+	});
+	$template->param(actions => \@actions);
+
+	if ($actions || @actions) {
 		$template->param(have_actions => 1);
 	}
 
@@ -120,8 +143,9 @@ sub genpage ($$) {
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
-		ctime => displaytime($pagectime{$page}),
+		ctime => displaytime($pagectime{$page}, undef, 1),
 		baseurl => baseurl($page),
+		html5 => $config{html5},
 	);
 
 	run_hooks(pagetemplate => sub {
@@ -130,10 +154,6 @@ sub genpage ($$) {
 	
 	$content=$template->output;
 	
-	run_hooks(postscan => sub {
-		shift->(page => $page, content => $content);
-	});
-
 	run_hooks(format => sub {
 		$content=shift->(
 			page => $page,
@@ -164,6 +184,7 @@ sub scan ($) {
 		else {
 			$links{$page}=[];
 		}
+		delete $typedlinks{$page};
 
 		run_hooks(scan => sub {
 			shift->(
@@ -282,63 +303,55 @@ 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\/?//;
-			my $page = pagename($file);
-			if (! exists $pagesources{$page} &&
-			    file_pruned($file)) {
-				$File::Find::prune=1;
-				return;
-			}
-			return if -l $_ || -d _ || ! length $file;
 
-			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");
+			return;
+		}
+	
+		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\/?//;
-				my $page=pagename($file);
-				if (! exists $pagesources{$page} &&
-				    file_pruned($file)) {
-					$File::Find::prune=1;
-					return;
-				}
-				return if -l $_ || -d _ || ! length $file;
-
-				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;
 }
@@ -348,6 +361,8 @@ sub find_new_files ($) {
 	my @new;
 	my @internal_new;
 
+	my $times_noted;
+
 	foreach my $file (@$files) {
 		my $page=pagename($file);
 		if (exists $pagesources{$page} && $pagesources{$page} ne $file) {
@@ -359,16 +374,33 @@ sub find_new_files ($) {
 			if (isinternal($page)) {
 				push @internal_new, $file;
 			}
-			else {
+			elsif ($config{rcs}) {
 				push @new, $file;
-				if ($config{getctime} && -e "$config{srcdir}/$file") {
+				if ($config{gettime} && -e "$config{srcdir}/$file") {
+					if (! $times_noted) {
+						debug(sprintf(gettext("querying %s for file creation and modification times.."), $config{rcs}));
+						$times_noted=1;
+					}
+
 					eval {
-						my $time=rcs_getctime("$config{srcdir}/$file");
-						$pagectime{$page}=$time;
+						my $ctime=rcs_getctime("$config{srcdir}/$file");
+						if ($ctime > 0) {
+							$pagectime{$page}=$ctime;
+						}
 					};
 					if ($@) {
 						print STDERR $@;
 					}
+					my $mtime;
+					eval {
+						$mtime=rcs_getmtime("$config{srcdir}/$file");
+					};
+					if ($@) {
+						print STDERR $@;
+					}
+					elsif ($mtime > 0) {
+						utime($mtime, $mtime, "$config{srcdir}/$file");
+					}
 				}
 			}
 			$pagecase{lc $page}=$page;
@@ -386,33 +418,46 @@ sub find_del_files ($) {
 	my @del;
 	my @internal_del;
 
-	foreach my $page (keys %pagemtime) {
+	foreach my $page (keys %pagesources) {
 		if (! $pages->{$page}) {
 			if (isinternal($page)) {
 				push @internal_del, $pagesources{$page};
 			}
 			else {
-				debug(sprintf(gettext("removing old page %s"), $page));
 				push @del, $pagesources{$page};
 			}
 			$links{$page}=[];
+			delete $typedlinks{$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 obsolete %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_changed ($) {
 	my $files=shift;
 	my @changed;
@@ -484,6 +529,29 @@ sub remove_unrendered () {
 	}
 }
 
+sub link_types_changed ($$) {
+	# each is of the form { type => { link => 1 } }
+	my $new = shift;
+	my $old = shift;
+
+	return 0 if !defined $new && !defined $old;
+	return 1 if (!defined $new && %$old) || (!defined $old && %$new);
+
+	while (my ($type, $links) = each %$new) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $old->{$type}{$link};
+		}
+	}
+
+	while (my ($type, $links) = each %$old) {
+		foreach my $link (keys %$links) {
+			return 1 unless exists $new->{$type}{$link};
+		}
+	}
+
+	return 0;
+}
+
 sub calculate_changed_links ($$$) {
 	my ($changed, $del, $oldlink_targets)=@_;
 
@@ -510,6 +578,14 @@ sub calculate_changed_links ($$$) {
 			}
 			$linkchangers{lc($page)}=1;
 		}
+
+		# we currently assume that changing the type of a link doesn't
+		# change backlinks
+		if (!exists $linkchangers{lc($page)}) {
+			if (link_types_changed($typedlinks{$page}, $oldtypedlinks{$page})) {
+				$linkchangers{lc($page)}=1;
+			}
+		}
 	}
 
 	return \%backlinkchanged, \%linkchangers;
@@ -524,13 +600,23 @@ sub render_dependent ($$$$$$$) {
 	
 	my %lc_changed = map { lc(pagename($_)) => 1 } @changed;
 	my %lc_exists_changed = map { lc(pagename($_)) => 1 } @exists_changed;
+
+	foreach my $p ("templates/page.tmpl", keys %{$depends_simple{""}}) {
+		if ($rendered{$p} || grep { $_ eq $p } @$del) {
+			foreach my $f (@$files) {
+				next if $rendered{$f};
+				render($f, sprintf(gettext("building %s, which depends on %s"), $f, $p));
+			}
+			return 0;
+		}
+	}
 	 
 	foreach my $f (@$files) {
 		next if $rendered{$f};
 		my $p=pagename($f);
 		my $reason = undef;
-	
-		if (exists $depends_simple{$p}) {
+
+		if (exists $depends_simple{$p} && ! defined $reason) {
 			foreach my $d (keys %{$depends_simple{$p}}) {
 				if (($depends_simple{$p}{$d} & $IkiWiki::DEPEND_CONTENT &&
 				     $lc_changed{$d})
@@ -550,7 +636,7 @@ sub render_dependent ($$$$$$$) {
 		if (exists $depends{$p} && ! defined $reason) {
 			foreach my $dep (keys %{$depends{$p}}) {
 				my $sub=pagespec_translate($dep);
-				next if $@ || ! defined $sub;
+				next unless defined $sub;
 
 				# only consider internal files
 				# if the page explicitly depends
@@ -567,34 +653,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)
+					);
 				}
 			}
 		}
@@ -618,6 +705,49 @@ sub render_backlinks ($) {
 	}
 }
 
+sub gen_autofile ($$$) {
+	my $autofile=shift;
+	my $pages=shift;
+	my $del=shift;
+
+	if (file_pruned($autofile)) {
+		return;
+	}
+
+	my ($file)="$config{srcdir}/$autofile" =~ /$config{wiki_file_regexp}/; # untaint
+	if (! defined $file) {
+		return;
+	}
+
+	# Remember autofiles that were tried, and never try them again later.
+	if (exists $wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}) {
+		return;
+	}
+	$wikistate{$autofiles{$autofile}{plugin}}{autofile}{$autofile}=1;
+
+	if (srcfile($autofile, 1) || file_pruned($autofile)) {
+		return;
+	}
+	
+	if (-l $file || -d _ || -e _) {
+		return;
+	}
+
+	my $page = pagename($file);
+	if ($pages->{$page}) {
+		return;
+	}
+
+	if (grep { $_ eq $autofile } @$del) {
+		return;
+	}
+
+	$autofiles{$autofile}{generator}->();
+	$pages->{$page}=1;
+	return 1;
+}
+
+
 sub refresh () {
 	srcdir_check();
 	run_hooks(refresh => sub { shift->() });
@@ -632,7 +762,19 @@ 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);
 
 	foreach my $file (@$changed) {
 		render($file, sprintf(gettext("building %s"), $file));
@@ -647,7 +789,7 @@ sub refresh () {
 	foreach my $file (@$new, @$del) {
 		render_linkers($file);
 	}
-	
+
 	if (@$changed || @$internal_changed ||
 	    @$del || @$internal_del || @$internal_new) {
 		1 while render_dependent($files, $new, $internal_new,
@@ -658,14 +800,25 @@ sub refresh () {
 	render_backlinks($backlinkchanged);
 	remove_unrendered();
 
-	if (@$del) {
-		run_hooks(delete => sub { shift->(@$del) });
+	if (@$del || @$internal_del) {
+		run_hooks(delete => sub { shift->(@$del, @$internal_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();