X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/9875bc10d14d50f543f4aab3ce4e9dae060b8c23..ce029bfe044445d3d1fc10926c2ab6b9305753e0:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 4495b9cfd..272eb239a 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -85,12 +85,6 @@ sub genpage ($$) { #{{{
 		$actions++;
 	}
 		
-	if ($config{rcs} && exists $config{recentchangespage} &&
-	    $page ne $config{recentchangespage}) {
-		$template->param(recentchangesurl => urlto($config{recentchangespage}, $page));
-		$actions++;
-	}
-
 	if (length $config{historyurl}) {
 		my $u=$config{historyurl};
 		$u=~s/\[\[file\]\]/$pagesources{$page}/g;
@@ -132,6 +126,7 @@ sub genpage ($$) { #{{{
 		backlinks => $backlinks,
 		more_backlinks => $more_backlinks,
 		mtime => displaytime($pagemtime{$page}),
+		ctime => displaytime($pagectime{$page}),
 		baseurl => baseurl($page),
 	);
 
@@ -151,12 +146,6 @@ sub genpage ($$) { #{{{
 	return $content;
 } #}}}
 
-sub mtime ($) { #{{{
-	my $file=shift;
-	
-	return (stat($file))[9];
-} #}}}
-
 sub scan ($) { #{{{
 	my $file=shift;
 
@@ -167,21 +156,22 @@ sub scan ($) { #{{{
 		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, 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."/".gettext("discussion");
+			$links{$page}=[ $page."/".gettext("discussion") ];
 		}
-		$links{$page}=\@links;
-		
+		else {
+			$links{$page}=[];
+		}
+
+		run_hooks(scan => sub {
+			shift->(
+				page => $page,
+				content => $content,
+			);
+		});
+
 		# Preprocess in scan-only mode.
 		preprocess($page, $page, $content, 1);
 	}
@@ -201,7 +191,7 @@ sub render ($) { #{{{
 		will_render($page, htmlpage($page), 1);
 		return if $type=~/^_/;
 		
-		my $content=htmlize($page, $type,
+		my $content=htmlize($page, $page, $type,
 			linkify($page, $page,
 			preprocess($page, $page,
 			filter($page, $page,
@@ -209,12 +199,21 @@ sub render ($) { #{{{
 		
 		my $output=htmlpage($page);
 		writefile($output, $config{destdir}, genpage($page, $content));
-		utime($pagemtime{$page}, $pagemtime{$page}, $config{destdir}."/".$output);
 	}
 	else {
-		my $srcfd=readfile($srcfile, 1, 1);
 		delete $depends{$file};
 		will_render($file, $file, 1);
+		
+		if ($config{hardlink}) {
+			prep_writefile($file, $config{destdir});
+			unlink($config{destdir}."/".$file);
+			if (link($srcfile, $config{destdir}."/".$file)) {
+				return;
+			}
+			# if hardlink fails, fall back to copying
+		}
+		
+		my $srcfd=readfile($srcfile, 1, 1);
 		writefile($file, $config{destdir}, undef, 1, sub {
 			my $destfd=shift;
 			my $cleanup=shift;
@@ -235,7 +234,6 @@ sub render ($) { #{{{
 				}
 			}
 		});
-		utime($pagemtime{$file}, $pagemtime{$file}, $config{destdir}."/".$file);
 	}
 } #}}}
 
@@ -275,7 +273,7 @@ sub refresh () { #{{{
 			if (file_pruned($_, $config{srcdir})) {
 				$File::Find::prune=1;
 			}
-			elsif (! -d $_ && ! -l $_) {
+			elsif (! -l $_ && ! -d _) {
 				my ($f)=/$config{wiki_file_regexp}/; # untaint
 				if (! defined $f) {
 					warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
@@ -296,7 +294,7 @@ sub refresh () { #{{{
 				if (file_pruned($_, $dir)) {
 					$File::Find::prune=1;
 				}
-				elsif (! -d $_ && ! -l $_) {
+				elsif (! -l $_ && ! -d _) {
 					my ($f)=/$config{wiki_file_regexp}/; # untaint
 					if (! defined $f) {
 						warn(sprintf(gettext("skipping bad filename %s"), $_)."\n");
@@ -306,8 +304,8 @@ sub refresh () { #{{{
 						# avoid underlaydir
 						# override attacks; see
 						# security.mdwn
-						if (! -e "$config{srcdir}/$f" && 
-						    ! -l "$config{srcdir}/$f") {
+						if (! -l "$config{srcdir}/$f" && 
+						    ! -e _) {
 						    	my $page=pagename($f);
 							if (! $exists{$page}) {
 								push @files, $f;
@@ -321,7 +319,6 @@ sub refresh () { #{{{
 	};
 
 	my (%rendered, @add, @del, @internal);
-
 	# check for added or removed pages
 	foreach my $file (@files) {
 		my $page=pagename($file);
@@ -332,13 +329,19 @@ sub refresh () { #{{{
 			}
 			else {
 				push @add, $file;
+				if ($config{getctime} && -e "$config{srcdir}/$file") {
+					eval {
+						my $time=rcs_getctime("$config{srcdir}/$file");
+						$pagectime{$page}=$time;
+					};
+					if ($@) {
+						print STDERR $@;
+					}
+				}
 			}
 			$pagecase{lc $page}=$page;
-			if ($config{getctime} && -e "$config{srcdir}/$file") {
-				$pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
-			}
-			elsif (! exists $pagectime{$page}) {
-				$pagectime{$page}=mtime(srcfile($file));
+			if (! exists $pagectime{$page}) {
+				$pagectime{$page}=(srcfile_stat($file))[10];
 			}
 		}
 	}
@@ -369,14 +372,15 @@ sub refresh () { #{{{
 	my @needsbuild;
 	foreach my $file (@files) {
 		my $page=pagename($file);
-		
-		my $mtime=mtime(srcfile($file));
+		my ($srcfile, @stat)=srcfile_stat($file);
 		if (! exists $pagemtime{$page} ||
-		    $mtime > $pagemtime{$page} ||
+		    $stat[9] > $pagemtime{$page} ||
 	    	    $forcerebuild{$page}) {
-			$pagemtime{$page}=$mtime;
+			$pagemtime{$page}=$stat[9];
 			if (isinternal($page)) {
 				push @internal, $file;
+				# Preprocess internal page in scan-only mode.
+				preprocess($page, $page, readfile($srcfile), 1);
 			}
 			else {
 				push @needsbuild, $file;
@@ -500,8 +504,6 @@ sub refresh () { #{{{
 } #}}}
 
 sub commandline_render () { #{{{
-	loadplugins();
-	checkconfig();
 	lockwiki();
 	loadindex();
 	unlockwiki();
@@ -518,8 +520,8 @@ sub commandline_render () { #{{{
 	$content=filter($page, $page, $content);
 	$content=preprocess($page, $page, $content);
 	$content=linkify($page, $page, $content);
-	$content=htmlize($page, $type, $content);
-	$pagemtime{$page}=mtime($srcfile);
+	$content=htmlize($page, $page, $type, $content);
+	$pagemtime{$page}=(stat($srcfile))[9];
 
 	print genpage($page, $content);
 	exit 0;