X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/49bf877701d89d613dcf5c2d85bd08876a636dba..0b977fa22cabf8e1050857412123015c07c30c19:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 026b3582e..35d663a7a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,30 +7,44 @@ use strict;
 use IkiWiki;
 use Encode;
 
+my %backlinks;
+my $backlinks_calculated=0;
+
+sub calculate_backlinks () { #{{{
+	return if $backlinks_calculated;
+	%backlinks=();
+	foreach my $page (keys %links) {
+		foreach my $link (@{$links{$page}}) {
+			my $bestlink=bestlink($page, $link);
+			if (length $bestlink && $bestlink ne $page) {
+				$backlinks{$bestlink}{$page}=1;
+			}
+		}
+	}
+	$backlinks_calculated=1;
+} #}}}
+
 sub backlinks ($) { #{{{
 	my $page=shift;
 
-	my @links;
-	foreach my $p (keys %links) {
-		next if bestlink($page, $p) eq $page;
+	calculate_backlinks();
 
-		if (grep { length $_ && bestlink($p, $_) eq $page } @{$links{$p}}) {
-			my $href=abs2rel(htmlpage($p), dirname($page));
-			
-			# Trim common dir prefixes from both pages.
-			my $p_trimmed=$p;
-			my $page_trimmed=$page;
-			my $dir;
-			1 while (($dir)=$page_trimmed=~m!^([^/]+/)!) &&
-			        defined $dir &&
-			        $p_trimmed=~s/^\Q$dir\E// &&
-			        $page_trimmed=~s/^\Q$dir\E//;
-				       
-			push @links, { url => $href, page => pagetitle($p_trimmed) };
-		}
+	my @links;
+	foreach my $p (keys %{$backlinks{$page}}) {
+		my $href=urlto($p, $page);
+                
+		# Trim common dir prefixes from both pages.
+		my $p_trimmed=$p;
+		my $page_trimmed=$page;
+		my $dir;
+		1 while (($dir)=$page_trimmed=~m!^([^/]+/)!) &&
+		        defined $dir &&
+		        $p_trimmed=~s/^\Q$dir\E// &&
+		        $page_trimmed=~s/^\Q$dir\E//;
+			       
+		push @links, { url => $href, page => pagetitle($p_trimmed) };
 	}
-
-	return sort { $a->{page} cmp $b->{page} } @links;
+	return @links;
 } #}}}
 
 sub parentlinks ($) { #{{{
@@ -39,18 +53,14 @@ sub parentlinks ($) { #{{{
 	my @ret;
 	my $pagelink="";
 	my $path="";
-	my $skip=1;
+	my $title=$config{wikiname};
+	
 	return if $page eq 'index'; # toplevel
-	foreach my $dir (reverse split("/", $page)) {
-		if (! $skip) {
-			$path.="../";
-			unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };
-		}
-		else {
-			$skip=0;
-		}
+	foreach my $dir (split("/", $page)) {
+		push @ret, { url => urlto($path, $page), page => $title };
+		$path.="/".$dir;
+		$title=pagetitle($dir);
 	}
-	unshift @ret, { url => length $path ? $path : ".", page => $config{wikiname} };
 	return @ret;
 } #}}}
 
@@ -59,11 +69,19 @@ sub genpage ($$$) { #{{{
 	my $content=shift;
 	my $mtime=shift;
 
-	my $template=template("page.tmpl", blind_cache => 1);
+	my $templatefile;
+	run_hooks(templatefile => sub {
+		return if defined $templatefile;
+		my $file=shift->(page => $page);
+		if (defined $file && defined template_file($file)) {
+			$templatefile=$file;
+		}
+	});
+	my $template=template(defined $templatefile ? $templatefile : 'page.tmpl', blind_cache => 1);
 	my $actions=0;
 
 	if (length $config{cgiurl}) {
-		$template->param(editurl => cgiurl(do => "edit", page => $page));
+		$template->param(editurl => cgiurl(do => "edit", page => pagetitle($page, 1)));
 		$template->param(prefsurl => cgiurl(do => "prefs"));
 		if ($config{rcs}) {
 			$template->param(recentchangesurl => cgiurl(do => "recentchanges"));
@@ -78,14 +96,30 @@ sub genpage ($$$) { #{{{
 		$actions++;
 	}
 	if ($config{discussion}) {
-		$template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
-		$actions++;
+		my $discussionlink=gettext("discussion");
+		if ($page !~ /.*\/\Q$discussionlink\E$/ &&
+		   (length $config{cgiurl} ||
+		    exists $links{$page."/".$discussionlink})) {
+			$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
+			$actions++;
+		}
 	}
 
 	if ($actions) {
 		$template->param(have_actions => 1);
 	}
 
+	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
+	my ($backlinks, $more_backlinks);
+	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
+		$backlinks=\@backlinks;
+		$more_backlinks=[];
+	}
+	else {
+		$backlinks=[@backlinks[0..$config{numbacklinks}-1]];
+		$more_backlinks=[@backlinks[$config{numbacklinks}..$#backlinks]];
+	}
+
 	$template->param(
 		title => $page eq 'index' 
 			? $config{wikiname} 
@@ -93,7 +127,8 @@ sub genpage ($$$) { #{{{
 		wikiname => $config{wikiname},
 		parentlinks => [parentlinks($page)],
 		content => $content,
-		backlinks => [backlinks($page)],
+		backlinks => $backlinks,
+		more_backlinks => $more_backlinks,
 		mtime => displaytime($mtime),
 		baseurl => baseurl($page),
 	);
@@ -128,17 +163,28 @@ sub scan ($) { #{{{
 		my $srcfile=srcfile($file);
 		my $content=readfile($srcfile);
 		my $page=pagename($file);
+		will_render($page, htmlpage($page), 1);
+
+		# Always needs to be done, since filters might add links
+		# to the content.
+		$content=filter($page, $page, $content);
 
 		my @links;
 		while ($content =~ /(?<!\\)$config{wiki_link_regexp}/g) {
-			push @links, titlepage($2);
+			push @links, linkpage($2);
 		}
 		if ($config{discussion}) {
-			# Discussion links are a special case since they're not in the
-			# text of the page, but on its template.
-			push @links, "$page/discussion";
+			# Discussion links are a special case since they're
+			# not in the text of the page, but on its template.
+			push @links, $page."/".gettext("discussion");
 		}
 		$links{$page}=\@links;
+		
+		# Preprocess in scan-only mode.
+		preprocess($page, $page, $content, 1);
+	}
+	else {
+		will_render($file, $file, 1);
 	}
 } #}}}
 
@@ -148,26 +194,43 @@ sub render ($) { #{{{
 	my $type=pagetype($file);
 	my $srcfile=srcfile($file);
 	if (defined $type) {
-		my $content=readfile($srcfile);
 		my $page=pagename($file);
 		delete $depends{$page};
 		will_render($page, htmlpage($page), 1);
 		
-		$content=filter($page, $content);
-		$content=preprocess($page, $page, $content);
-		$content=linkify($page, $page, $content);
-		$content=htmlize($page, $type, $content);
+		my $content=htmlize($page, $type,
+			linkify($page, $page,
+			preprocess($page, $page,
+			filter($page, $page,
+			readfile($srcfile)))));
 		
 		writefile(htmlpage($page), $config{destdir},
 			genpage($page, $content, mtime($srcfile)));
-		$oldpagemtime{$page}=time;
 	}
 	else {
-		my $content=readfile($srcfile, 1);
+		my $srcfd=readfile($srcfile, 1, 1);
 		delete $depends{$file};
 		will_render($file, $file, 1);
-		writefile($file, $config{destdir}, $content, 1);
-		$oldpagemtime{$file}=time;
+		writefile($file, $config{destdir}, undef, 1, sub {
+			my $destfd=shift;
+			my $cleanup=shift;
+
+			my $blksize = 16384;
+			my ($len, $buf, $written);
+			while ($len = sysread $srcfd, $buf, $blksize) {
+				if (! defined $len) {
+					next if $! =~ /^Interrupted/;
+					error("failed to read $srcfile: $!", $cleanup);
+				}
+				my $offset = 0;
+				while ($len) {
+					defined($written = syswrite $destfd, $buf, $len, $offset)
+						or error("failed to write $file: $!", $cleanup);
+					$len -= $written;
+					$offset += $written;
+				}
+			}
+		});
 	}
 } #}}}
 
@@ -186,17 +249,18 @@ sub refresh () { #{{{
 	my %exists;
 	my @files;
 	eval q{use File::Find};
+	error($@) if $@;
 	find({
 		no_chdir => 1,
 		wanted => sub {
 			$_=decode_utf8($_);
-			if (/$config{wiki_file_prune_regexp}/) {
+			if (file_pruned($_, $config{srcdir})) {
 				$File::Find::prune=1;
 			}
 			elsif (! -d $_ && ! -l $_) {
 				my ($f)=/$config{wiki_file_regexp}/; # untaint
 				if (! defined $f) {
-					warn("skipping bad filename $_\n");
+					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
 				}
 				else {
 					$f=~s/^\Q$config{srcdir}\E\/?//;
@@ -206,31 +270,37 @@ sub refresh () { #{{{
 			}
 		},
 	}, $config{srcdir});
-	find({
-		no_chdir => 1,
-		wanted => sub {
-			$_=decode_utf8($_);
-			if (/$config{wiki_file_prune_regexp}/) {
-				$File::Find::prune=1;
-			}
-			elsif (! -d $_ && ! -l $_) {
-				my ($f)=/$config{wiki_file_regexp}/; # untaint
-				if (! defined $f) {
-					warn("skipping bad filename $_\n");
+	foreach my $dir (@{$config{underlaydirs}}, $config{underlaydir}) {
+		find({
+			no_chdir => 1,
+			wanted => sub {
+				$_=decode_utf8($_);
+				if (file_pruned($_, $dir)) {
+					$File::Find::prune=1;
 				}
-				else {
-					# Don't add files that are in the
-					# srcdir.
-					$f=~s/^\Q$config{underlaydir}\E\/?//;
-					if (! -e "$config{srcdir}/$f" && 
-					    ! -l "$config{srcdir}/$f") {
-						push @files, $f;
-						$exists{pagename($f)}=1;
+				elsif (! -d $_ && ! -l $_) {
+					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 (! -e "$config{srcdir}/$f" && 
+						    ! -l "$config{srcdir}/$f") {
+						    	my $page=pagename($f);
+							if (! $exists{$page}) {
+								push @files, $f;
+								$exists{$page}=1;
+							}
+						}
 					}
 				}
-			}
-		},
-	}, $config{underlaydir});
+			},
+		}, $dir);
+	};
 
 	my %rendered;
 
@@ -238,11 +308,10 @@ sub refresh () { #{{{
 	my @add;
 	foreach my $file (@files) {
 		my $page=pagename($file);
-		if (! $oldpagemtime{$page}) {
+		$pagesources{$page}=$file;
+		if (! $pagemtime{$page}) {
 			push @add, $file;
-			scan($file);
 			$pagecase{lc $page}=$page;
-			$pagesources{$page}=$file;
 			if ($config{getctime} && -e "$config{srcdir}/$file") {
 				$pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
 			}
@@ -252,67 +321,67 @@ sub refresh () { #{{{
 		}
 	}
 	my @del;
-	foreach my $page (keys %oldpagemtime) {
+	foreach my $page (keys %pagemtime) {
 		if (! $exists{$page}) {
-			debug("removing old page $page");
+			debug(sprintf(gettext("removing old page %s"), $page));
 			push @del, $pagesources{$page};
 			$links{$page}=[];
 			$renderedfiles{$page}=[];
-			$oldpagemtime{$page}=0;
+			$pagemtime{$page}=0;
 			prune($config{destdir}."/".$_)
 				foreach @{$oldrenderedfiles{$page}};
 			delete $pagesources{$page};
+			foreach (keys %destsources) {
+				if ($destsources{$_} eq $page) {
+					delete $destsources{$_};
+				}
+			}
 		}
 	}
-	
-	# scan updated files to update info about them
+
+	# find changed and new files
+	my @needsbuild;
 	foreach my $file (@files) {
 		my $page=pagename($file);
 		
-		if (! exists $oldpagemtime{$page} ||
-		    mtime(srcfile($file)) > $oldpagemtime{$page} ||
+		my $mtime=mtime(srcfile($file));
+		if (! exists $pagemtime{$page} ||
+		    $mtime > $pagemtime{$page} ||
 	    	    $forcerebuild{$page}) {
-		    	debug("scanning $file");
-			scan($file);
+			$pagemtime{$page}=$mtime;
+			push @needsbuild, $file;
 		}
 	}
+	run_hooks(needsbuild => sub { shift->(\@needsbuild) });
 
-	# render any updated files
-	foreach my $file (@files) {
-		my $page=pagename($file);
-		
-		if (! exists $oldpagemtime{$page} ||
-		    mtime(srcfile($file)) > $oldpagemtime{$page} ||
-	    	    $forcerebuild{$page}) {
-		    	debug("rendering $file");
-			render($file);
-			$rendered{$file}=1;
-		}
+	# scan and render files
+	foreach my $file (@needsbuild) {
+		debug(sprintf(gettext("scanning %s"), $file));
+		scan($file);
+	}
+	calculate_backlinks();
+	foreach my $file (@needsbuild) {
+		debug(sprintf(gettext("rendering %s"), $file));
+		render($file);
+		$rendered{$file}=1;
 	}
 	
-	# if any files were added or removed, check to see if each page
-	# needs an update due to linking to them or inlining them
+	# rebuild pages that link to added or removed pages
 	if (@add || @del) {
-FILE:		foreach my $file (@files) {
-			next if $rendered{$file};
-			my $page=pagename($file);
-			foreach my $f (@add, @del) {
-				my $p=pagename($f);
-				foreach my $link (@{$links{$page}}) {
-					if (bestlink($page, $link) eq $p) {
-		   				debug("rendering $file, which links to $p");
-						render($file);
-						$rendered{$file}=1;
-						next FILE;
-					}
-				}
+		foreach my $f (@add, @del) {
+			my $p=pagename($f);
+			foreach my $page (keys %{$backlinks{$p}}) {
+				my $file=$pagesources{$page};
+				next if $rendered{$file};
+		   		debug(sprintf(gettext("rendering %s, which links to %s"), $file, $p));
+				render($file);
+				$rendered{$file}=1;
 			}
 		}
 	}
 
-	# Handle backlinks; if a page has added/removed links, update the
-	# pages it links to. Also handles rebuilding dependant pages.
 	if (%rendered || @del) {
+		# rebuild dependant pages
 		foreach my $f (@files) {
 			next if $rendered{$f};
 			my $p=pagename($f);
@@ -320,8 +389,8 @@ FILE:		foreach my $file (@files) {
 				foreach my $file (keys %rendered, @del) {
 					next if $f eq $file;
 					my $page=pagename($file);
-					if (pagespec_match($page, $depends{$p})) {
-						debug("rendering $f, which depends on $page");
+					if (pagespec_match($page, $depends{$p}, location => $p)) {
+						debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
 						render($f);
 						$rendered{$f}=1;
 						last;
@@ -330,6 +399,8 @@ FILE:		foreach my $file (@files) {
 			}
 		}
 		
+		# handle backlinks; if a page has added/removed links,
+		# update the pages it links to
 		my %linkchanged;
 		foreach my $file (keys %rendered, @del) {
 			my $page=pagename($file);
@@ -357,19 +428,19 @@ FILE:		foreach my $file (@files) {
 		    	my $linkfile=$pagesources{$link};
 			if (defined $linkfile) {
 				next if $rendered{$linkfile};
-				debug("rendering $linkfile, to update its backlinks");
+				debug(sprintf(gettext("rendering %s, to update its backlinks"), $linkfile));
 				render($linkfile);
 				$rendered{$linkfile}=1;
 			}
 		}
 	}
 
-	# Remove no longer rendered files.
+	# remove no longer rendered files
 	foreach my $src (keys %rendered) {
 		my $page=pagename($src);
 		foreach my $file (@{$oldrenderedfiles{$page}}) {
 			if (! grep { $_ eq $file } @{$renderedfiles{$page}}) {
-				debug("removing $file, no longer rendered by $page");
+				debug(sprintf(gettext("removing %s, no longer rendered by %s"), $file, $page));
 				prune($config{destdir}."/".$file);
 			}
 		}
@@ -395,11 +466,11 @@ sub commandline_render () { #{{{
 	$file=~s/\Q$config{srcdir}\E\/?//;
 
 	my $type=pagetype($file);
-	die "ikiwiki: cannot render $srcfile\n" unless defined $type;
+	die sprintf(gettext("ikiwiki: cannot render %s"), $srcfile)."\n" unless defined $type;
 	my $content=readfile($srcfile);
 	my $page=pagename($file);
 	$pagesources{$page}=$file;
-	$content=filter($page, $content);
+	$content=filter($page, $page, $content);
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
 	$content=htmlize($page, $type, $content);