X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/e49ff966a39d1037ccbf168b8dbd12618cf1b41e..cefbe6210f4e89984bb40062e4f9787b7372dd52:/IkiWiki/Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 1449b8931..deec539ae 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,37 +7,6 @@ use strict;
 use IkiWiki;
 use Encode;
 
-sub linkify ($$$) { #{{{
-	my $lpage=shift; # the page containing the links
-	my $page=shift; # the page the link will end up on (different for inline)
-	my $content=shift;
-
-	$content =~ s{(\\?)$config{wiki_link_regexp}}{
-		$2 ? ( $1 ? "[[$2|$3]]" : htmllink($lpage, $page, titlepage($3), 0, 0, pagetitle($2)))
-		   : ( $1 ? "[[$3]]" :    htmllink($lpage, $page, titlepage($3)))
-	}eg;
-	
-	return $content;
-} #}}}
-
-sub htmlize ($$) { #{{{
-	my $type=shift;
-	my $content=shift;
-	
-	if (exists $hooks{htmlize}{$type}) {
-		$content=$hooks{htmlize}{$type}{call}->($content);
-	}
-	else {
-		error("htmlization of $type not supported");
-	}
-
-	run_hooks(sanitize => sub {
-		$content=shift->($content);
-	});
-	
-	return $content;
-} #}}}
-
 sub backlinks ($) { #{{{
 	my $page=shift;
 
@@ -74,7 +43,7 @@ sub parentlinks ($) { #{{{
 	foreach my $dir (reverse split("/", $page)) {
 		if (! $skip) {
 			$path.="../";
-			unshift @ret, { url => "$path$dir.html", page => pagetitle($dir) };
+			unshift @ret, { url => $path.htmlpage($dir), page => pagetitle($dir) };
 		}
 		else {
 			$skip=0;
@@ -84,82 +53,6 @@ sub parentlinks ($) { #{{{
 	return @ret;
 } #}}}
 
-sub preprocess ($$$;$) { #{{{
-	my $page=shift; # the page the data comes from
-	my $destpage=shift; # the page the data will appear in (different for inline)
-	my $content=shift;
-	my $onlystrip=shift || 0; # strip directives without processing
-
-	my $handle=sub {
-		my $escape=shift;
-		my $command=shift;
-		my $params=shift;
-		if (length $escape) {
-			return "[[$command $params]]";
-		}
-		elsif ($onlystrip) {
-			return "";
-		}
-		elsif (exists $hooks{preprocess}{$command}) {
-			# Note: preserve order of params, some plugins may
-			# consider it significant.
-			my @params;
-			while ($params =~ /(?:(\w+)=)?(?:"([^"]+)"|(\S+))(?:\s+|$)/g) {
-				if (defined $1) {
-					push @params, $1, (defined $2 ? $2 : $3);
-				}
-				else {
-					push @params, (defined $2 ? $2 : $3), '';
-				}
-			}
-			return $hooks{preprocess}{$command}{call}->(
-				@params,
-				page => $page,
-				destpage => $destpage,
-			);
-		}
-		else {
-			return "[[$command not processed]]";
-		}
-	};
-	
-	$content =~ s{(\\?)$config{wiki_processor_regexp}}{$handle->($1, $2, $3)}eg;
-	return $content;
-} #}}}
-
-sub add_depends ($$) { #{{{
-	my $page=shift;
-	my $globlist=shift;
-	
-	if (! exists $depends{$page}) {
-		$depends{$page}=$globlist;
-	}
-	else {
-		$depends{$page}=globlist_merge($depends{$page}, $globlist);
-	}
-} # }}}
-
-sub globlist_merge ($$) { #{{{
-	my $a=shift;
-	my $b=shift;
-
-	my $ret="";
-	# Only add negated globs if they are not matched by the other globlist.
-	foreach my $i ((map { [ $a, $_ ] } split(" ", $b)), 
-	               (map { [ $b, $_ ] } split(" ", $a))) {
-		if ($i->[1]=~/^!(.*)/) {
-			if (! globlist_match($1, $i->[0])) {
-				$ret.=" ".$i->[1];
-			}
-		}
-		else {
-			$ret.=" ".$i->[1];
-		}
-	}
-	
-	return $ret;
-} #}}}
-
 sub genpage ($$$) { #{{{
 	my $page=shift;
 	my $content=shift;
@@ -201,35 +94,23 @@ sub genpage ($$$) { #{{{
 		content => $content,
 		backlinks => [backlinks($page)],
 		mtime => displaytime($mtime),
-		styleurl => styleurl($page),
+		baseurl => baseurl($page),
 	);
 
 	run_hooks(pagetemplate => sub {
 		shift->(page => $page, destpage => $page, template => $template);
 	});
 	
-	return $template->output;
-} #}}}
-
-sub check_overwrite ($$) { #{{{
-	# Important security check. Make sure to call this before saving
-	# any files to the source directory.
-	my $dest=shift;
-	my $src=shift;
-	
-	if (! exists $renderedfiles{$src} && -e $dest && ! $config{rebuild}) {
-		error("$dest already exists and was not rendered from $src before");
-	}
-} #}}}
+	$content=$template->output;
 
-sub displaytime ($) { #{{{
-	my $time=shift;
+	run_hooks(format => sub {
+		$content=shift->(
+			page => $page,
+			content => $content,
+		);
+	});
 
-	eval q{use POSIX};
-	# strftime doesn't know about encodings, so make sure
-	# its output is properly treated as utf8
-	return decode_utf8(POSIX::strftime(
-			$config{timeformat}, localtime($time)));
+	return $content;
 } #}}}
 
 sub mtime ($) { #{{{
@@ -256,17 +137,6 @@ sub findlinks ($$) { #{{{
 	}
 } #}}}
 
-sub filter ($$) {
-	my $page=shift;
-	my $content=shift;
-
-	run_hooks(filter => sub {
-		$content=shift->(page => $page, content => $content);
-	});
-
-	return $content;
-}
-
 sub render ($) { #{{{
 	my $file=shift;
 	
@@ -276,29 +146,27 @@ sub render ($) { #{{{
 		my $content=readfile($srcfile);
 		my $page=pagename($file);
 		delete $depends{$page};
+		will_render($page, htmlpage($page), 1);
 		
 		$content=filter($page, $content);
 		
 		$links{$page}=[findlinks($page, $content)];
 		
-		$content=linkify($page, $page, $content);
 		$content=preprocess($page, $page, $content);
-		$content=htmlize($type, $content);
+		$content=linkify($page, $page, $content);
+		$content=htmlize($page, $type, $content);
 		
-		check_overwrite("$config{destdir}/".htmlpage($page), $page);
 		writefile(htmlpage($page), $config{destdir},
 			genpage($page, $content, mtime($srcfile)));
 		$oldpagemtime{$page}=time;
-		$renderedfiles{$page}=htmlpage($page);
 	}
 	else {
 		my $content=readfile($srcfile, 1);
 		$links{$file}=[];
 		delete $depends{$file};
-		check_overwrite("$config{destdir}/$file", $file);
+		will_render($file, $file, 1);
 		writefile($file, $config{destdir}, $content, 1);
 		$oldpagemtime{$file}=time;
-		$renderedfiles{$file}=$file;
 	}
 } #}}}
 
@@ -373,6 +241,7 @@ sub refresh () { #{{{
 			debug("new page $page") unless exists $pagectime{$page};
 			push @add, $file;
 			$links{$page}=[];
+			$pagecase{lc $page}=$page;
 			$pagesources{$page}=$file;
 			if ($config{getctime} && -e "$config{srcdir}/$file") {
 				$pagectime{$page}=rcs_getctime("$config{srcdir}/$file");
@@ -387,9 +256,10 @@ sub refresh () { #{{{
 		if (! $exists{$page}) {
 			debug("removing old page $page");
 			push @del, $pagesources{$page};
-			prune($config{destdir}."/".$renderedfiles{$page});
-			delete $renderedfiles{$page};
+			$renderedfiles{$page}=[];
 			$oldpagemtime{$page}=0;
+			prune($config{destdir}."/".$_)
+				foreach @{$oldrenderedfiles{$page}};
 			delete $pagesources{$page};
 		}
 	}
@@ -441,7 +311,7 @@ FILE:		foreach my $file (@files) {
 				foreach my $file (keys %rendered, @del) {
 					next if $f eq $file;
 					my $page=pagename($file);
-					if (globlist_match($page, $depends{$p})) {
+					if (pagespec_match($page, $depends{$p})) {
 						debug("rendering $f, which depends on $page");
 						render($f);
 						$rendered{$f}=1;
@@ -484,6 +354,17 @@ FILE:		foreach my $file (@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");
+				prune($config{destdir}."/".$file);
+			}
+		}
+	}
+
 	if (@del) {
 		run_hooks(delete => sub { shift->(@del) });
 	}
@@ -492,4 +373,29 @@ FILE:		foreach my $file (@files) {
 	}
 } #}}}
 
+sub commandline_render () { #{{{
+	loadplugins();
+	checkconfig();
+	lockwiki();
+	loadindex();
+	unlockwiki();
+
+	my $srcfile=possibly_foolish_untaint($config{render});
+	my $file=$srcfile;
+	$file=~s/\Q$config{srcdir}\E\/?//;
+
+	my $type=pagetype($file);
+	die "ikiwiki: cannot render $srcfile\n" unless defined $type;
+	my $content=readfile($srcfile);
+	my $page=pagename($file);
+	$pagesources{$page}=$file;
+	$content=filter($page, $content);
+	$content=preprocess($page, $page, $content);
+	$content=linkify($page, $page, $content);
+	$content=htmlize($page, $type, $content);
+
+	print genpage($page, $content, mtime($srcfile));
+	exit 0;
+} #}}}
+
 1