X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8323bc5214bf3581ebfbad57385934033c228b76..68784b593fccf688f745e01679f416c78e563bbe:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 678075b82..3545df05a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -93,9 +93,14 @@ sub genpage ($$$) { #{{{
 		$template->param(historyurl => $u);
 		$actions++;
 	}
-	if ($config{discussion} && (length $config{cgiurl} || exists $links{"$page/discussion"})) {
-		$template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
-		$actions++;
+	if ($config{discussion}) {
+		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) {
@@ -157,7 +162,7 @@ sub scan ($) { #{{{
 		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";
+			push @links, $page."/".gettext("discussion");
 		}
 		$links{$page}=\@links;
 		
@@ -190,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;
 	}
 } #}}}
@@ -224,7 +248,7 @@ sub refresh () { #{{{
 			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\/?//;
@@ -244,7 +268,7 @@ sub refresh () { #{{{
 			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 pages that are in the
@@ -284,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}=[];
@@ -303,7 +327,7 @@ 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);
 		}
@@ -312,7 +336,7 @@ sub refresh () { #{{{
 
 	# render changed and new pages
 	foreach my $file (@changed) {
-		debug("rendering $file");
+		debug(sprintf(gettext("rendering %s"), $file));
 		render($file);
 		$rendered{$file}=1;
 	}
@@ -324,7 +348,7 @@ sub refresh () { #{{{
 			foreach my $page (keys %{$backlinks{$p}}) {
 				my $file=$pagesources{$page};
 				next if $rendered{$file};
-		   		debug("rendering $file, which links to $p");
+		   		debug(sprintf(gettext("rendering %s, which links to %s"), $file, $p));
 				render($file);
 				$rendered{$file}=1;
 			}
@@ -340,8 +364,8 @@ sub refresh () { #{{{
 				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 @@ sub refresh () { #{{{
 		    	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 @@ sub refresh () { #{{{
 		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;