X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/74b5fb09aae8166b3614c206a9e7e4a227cd9a16..188f1931c2a2fec7c5737985d5e6fb7a05f8ed04:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index f59e54f29..990b803de 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -11,6 +11,7 @@ my %backlinks;
 my $backlinks_calculated=0;
 
 sub calculate_backlinks () { #{{{
+	return if $backlinks_calculated;
 	%backlinks=();
 	foreach my $page (keys %links) {
 		foreach my $link (@{$links{$page}}) {
@@ -26,7 +27,7 @@ sub calculate_backlinks () { #{{{
 sub backlinks ($) { #{{{
 	my $page=shift;
 
-	calculate_backlinks() unless $backlinks_calculated;
+	calculate_backlinks();
 
 	my @links;
 	return unless $backlinks{$page};
@@ -78,7 +79,7 @@ sub genpage ($$$) { #{{{
 	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"));
@@ -93,8 +94,13 @@ 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) {
@@ -151,12 +157,12 @@ sub scan ($) { #{{{
 
 		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;
 		
@@ -189,10 +195,29 @@ sub render ($) { #{{{
 		$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);
+		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;
+				}
+			}
+		});
 		$oldpagemtime{$file}=time;
 	}
 } #}}}
@@ -212,17 +237,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\/?//;
@@ -236,22 +262,25 @@ sub refresh () { #{{{
 		no_chdir => 1,
 		wanted => sub {
 			$_=decode_utf8($_);
-			if (/$config{wiki_file_prune_regexp}/) {
+			if (file_pruned($_, $config{underlaydir})) {
 				$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 {
-					# Don't add files that are in the
+					# Don't add pages 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;
+					    	my $page=pagename($f);
+						if (! $exists{$page}) {
+							push @files, $f;
+							$exists{$page}=1;
+						}
 					}
 				}
 			}
@@ -264,10 +293,10 @@ sub refresh () { #{{{
 	my @add;
 	foreach my $file (@files) {
 		my $page=pagename($file);
+		$pagesources{$page}=$file;
 		if (! $oldpagemtime{$page}) {
 			push @add, $file;
 			$pagecase{lc $page}=$page;
-			$pagesources{$page}=$file;
 			if ($config{getctime} && -e "$config{srcdir}/$file") {
 				$pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
 			}
@@ -279,7 +308,7 @@ sub refresh () { #{{{
 	my @del;
 	foreach my $page (keys %oldpagemtime) {
 		if (! $exists{$page}) {
-			debug("removing old page $page");
+			debug(sprintf(gettext("removing old page %s"), $page));
 			push @del, $pagesources{$page};
 			$links{$page}=[];
 			$renderedfiles{$page}=[];
@@ -298,35 +327,30 @@ sub refresh () { #{{{
 		if (! exists $oldpagemtime{$page} ||
 		    mtime(srcfile($file)) > $oldpagemtime{$page} ||
 	    	    $forcerebuild{$page}) {
-		    	debug("scanning $file");
+		    	debug(sprintf(gettext("scanning %s"), $file));
 			push @changed, $file;
 			scan($file);
 		}
 	}
+	calculate_backlinks();
 
 	# render changed and new pages
 	foreach my $file (@changed) {
-		debug("rendering $file");
+		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;
 			}
 		}
 	}
@@ -340,8 +364,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}, $p)) {
+						debug(sprintf(gettext("rendering %s, which depends on %s"), $f, $page));
 						render($f);
 						$rendered{$f}=1;
 						last;
@@ -379,7 +403,7 @@ 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;
 			}
@@ -391,7 +415,7 @@ FILE:		foreach my $file (@files) {
 		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);
 			}
 		}
@@ -417,7 +441,7 @@ 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;