X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/58141a0ebcdf3313a83af712b83f8acd1c08aa3b..06a8202931025b763414be5166ce374db173e50b:/IkiWiki.pm?ds=sidebyside

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 8b3109a34..5f0dca385 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -16,7 +16,9 @@ our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
                  bestlink htmllink readfile writefile pagetype srcfile pagename
                  displaytime will_render gettext
                  %config %links %renderedfiles %pagesources);
-our $VERSION = 1.01; # plugin interface version
+our $VERSION = 1.01; # plugin interface version, next is ikiwiki version
+our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
+my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
 
 # Optimisation.
 use Memoize;
@@ -24,11 +26,9 @@ memoize("abs2rel");
 memoize("pagespec_translate");
 memoize("file_pruned");
 
-my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE
-our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE
-
 sub defaultconfig () { #{{{
-	wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./, qr/\.x?html?$/,
+	wiki_file_prune_regexps => [qr/\.\./, qr/^\./, qr/\/\./,
+		qr/\.x?html?$/, qr/\.ikiwiki-new$/,
 		qr/(^|\/).svn\//, qr/.arch-ids\//, qr/{arch}\//],
 	wiki_link_regexp => qr/\[\[(?:([^\]\|]+)\|)?([^\s\]]+)\]\]/,
 	wiki_file_regexp => qr/(^[-[:alnum:]_.:\/+]+$)/,
@@ -65,7 +65,8 @@ sub defaultconfig () { #{{{
 	setup => undef,
 	adminuser => undef,
 	adminemail => undef,
-	plugin => [qw{mdwn inline htmlscrubber passwordauth signinedit lockedit}],
+	plugin => [qw{mdwn inline htmlscrubber passwordauth signinedit
+	              lockedit conditional}],
 	timeformat => '%c',
 	locale => undef,
 	sslcookie => 0,
@@ -141,14 +142,19 @@ sub loadplugin ($) { #{{{
 	}
 } #}}}
 
-sub error ($) { #{{{
+sub error ($;$) { #{{{
+	my $message=shift;
+	my $cleaner=shift;
 	if ($config{cgi}) {
 		print "Content-type: text/html\n\n";
 		print misctemplate(gettext("Error"),
-			"<p>".gettext("Error").": @_</p>");
+			"<p>".gettext("Error").": $message</p>");
+	}
+	log_message(debug => $message) if $config{syslog};
+	if (defined $cleaner) {
+		$cleaner->();
 	}
-	log_message(error => @_);
-	exit(1);
+	die $message."\n";
 } #}}}
 
 sub debug ($) { #{{{
@@ -245,7 +251,7 @@ sub readfile ($;$$) { #{{{
 	binmode(IN) if ($binary);
 	return \*IN if $wantfd;
 	my $ret=<IN>;
-	close IN;
+	close IN || error("failed to read $file: $!");
 	return $ret;
 } #}}}
 
@@ -254,7 +260,7 @@ sub writefile ($$$;$$) { #{{{
 	my $destdir=shift; # directory to put file in
 	my $content=shift;
 	my $binary=shift;
-	my $wantfd=shift;
+	my $writer=shift;
 	
 	my $test=$file;
 	while (length $test) {
@@ -263,8 +269,12 @@ sub writefile ($$$;$$) { #{{{
 		}
 		$test=dirname($test);
 	}
+	my $newfile="$destdir/$file.ikiwiki-new";
+	if (-l $newfile) {
+		error("cannot write to a symlink ($newfile)");
+	}
 
-	my $dir=dirname("$destdir/$file");
+	my $dir=dirname($newfile);
 	if (! -d $dir) {
 		my $d="";
 		foreach my $s (split(m!/+!, $dir)) {
@@ -274,12 +284,19 @@ sub writefile ($$$;$$) { #{{{
 			}
 		}
 	}
-	
-	open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
+
+	my $cleanup = sub { unlink($newfile) };
+	open (OUT, ">$newfile") || error("failed to write $newfile: $!", $cleanup);
 	binmode(OUT) if ($binary);
-	return \*OUT if $wantfd;
-	print OUT $content;
-	close OUT;
+	if ($writer) {
+		$writer->(\*OUT, $cleanup);
+	}
+	else {
+		print OUT $content || error("failed writing to $newfile: $!", $cleanup);
+	}
+	close OUT || error("failed saving $newfile: $!", $cleanup);
+	rename($newfile, "$destdir/$file") || 
+		error("failed renaming $newfile to $destdir/$file: $!", $cleanup);
 } #}}}
 
 my %cleared;
@@ -576,7 +593,7 @@ sub lockwiki () { #{{{
 		debug("wiki seems to be locked, waiting for lock");
 		my $wait=600; # arbitrary, but don't hang forever to 
 		              # prevent process pileup
-		for (1..600) {
+		for (1..$wait) {
 			return if flock(WIKILOCK, 2 | 4);
 			sleep 1;
 		}
@@ -625,8 +642,9 @@ sub saveindex () { #{{{
 	if (! -d $config{wikistatedir}) {
 		mkdir($config{wikistatedir});
 	}
-	open (OUT, ">$config{wikistatedir}/index") || 
-		error("cannot write to $config{wikistatedir}/index: $!");
+	my $newfile="$config{wikistatedir}/index.new";
+	my $cleanup = sub { unlink($newfile) };
+	open (OUT, ">$newfile") || error("cannot write to $newfile: $!", $cleanup);
 	foreach my $page (keys %oldpagemtime) {
 		next unless $oldpagemtime{$page};
 		my $line="mtime=$oldpagemtime{$page} ".
@@ -638,9 +656,11 @@ sub saveindex () { #{{{
 		if (exists $depends{$page}) {
 			$line.=" depends=".encode_entities($depends{$page}, " \t\n");
 		}
-		print OUT $line."\n";
+		print OUT $line."\n" || error("failed writing to $newfile: $!", $cleanup);
 	}
-	close OUT;
+	close OUT || error("failed saving to $newfile: $!", $cleanup);
+	rename($newfile, "$config{wikistatedir}/index") ||
+		error("failed renaming $newfile to $config{wikistatedir}/index", $cleanup);
 } #}}}
 
 sub template_file ($) { #{{{
@@ -850,11 +870,16 @@ sub pagespec_translate ($) { #{{{
 		elsif ($word eq "(" || $word eq ")" || $word eq "!") {
 			$code.=" ".$word;
 		}
-		elsif ($word =~ /^(link|backlink|created_before|created_after|creation_month|creation_year|creation_day)\((.+)\)$/) {
-			$code.=" match_$1(\$page, ".safequote($2).")";
+		elsif ($word =~ /^(\w+)\((.*)\)$/) {
+			if (exists $IkiWiki::PageSpec::{"match_$1"}) {
+				$code.=" IkiWiki::PageSpec::match_$1(\$page, ".safequote($2).")";
+			}
+			else {
+				$code.=" 0";
+			}
 		}
 		else {
-			$code.=" match_glob(\$page, ".safequote($word).", \$from)";
+			$code.=" IkiWiki::PageSpec::match_glob(\$page, ".safequote($word).", \$from)";
 		}
 	}
 
@@ -865,23 +890,25 @@ sub pagespec_match ($$;$) { #{{{
 	my $page=shift;
 	my $spec=shift;
 	my $from=shift;
-	if (! defined $from){
-		$from = "";
-	}
 
 	return eval pagespec_translate($spec);
 } #}}}
 
+package IkiWiki::PageSpec;
+
 sub match_glob ($$$) { #{{{
 	my $page=shift;
 	my $glob=shift;
 	my $from=shift;
+	if (! defined $from){
+		$from = "";
+	}
 
 	# relative matching
 	if ($glob =~ m!^\./!) {
 		$from=~s!/?[^/]+$!!;
-		$glob=~s!^\./!!;a
-		$glob="$from/$glob";
+		$glob=~s!^\./!!;
+		$glob="$from/$glob" if length $from;
 	}
 
 	# turn glob into safe regexp
@@ -896,7 +923,7 @@ sub match_link ($$) { #{{{
 	my $page=shift;
 	my $link=lc(shift);
 
-	my $links = $links{$page} or return undef;
+	my $links = $IkiWiki::links{$page} or return undef;
 	foreach my $p (@$links) {
 		return 1 if lc $p eq $link;
 	}
@@ -911,8 +938,8 @@ sub match_created_before ($$) { #{{{
 	my $page=shift;
 	my $testpage=shift;
 
-	if (exists $pagectime{$testpage}) {
-		return $pagectime{$page} < $pagectime{$testpage};
+	if (exists $IkiWiki::pagectime{$testpage}) {
+		return $IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage};
 	}
 	else {
 		return 0;
@@ -923,8 +950,8 @@ sub match_created_after ($$) { #{{{
 	my $page=shift;
 	my $testpage=shift;
 
-	if (exists $pagectime{$testpage}) {
-		return $pagectime{$page} > $pagectime{$testpage};
+	if (exists $IkiWiki::pagectime{$testpage}) {
+		return $IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage};
 	}
 	else {
 		return 0;
@@ -932,15 +959,15 @@ sub match_created_after ($$) { #{{{
 } #}}}
 
 sub match_creation_day ($$) { #{{{
-	return ((gmtime($pagectime{shift()}))[3] == shift);
+	return ((gmtime($IkiWiki::pagectime{shift()}))[3] == shift);
 } #}}}
 
 sub match_creation_month ($$) { #{{{
-	return ((gmtime($pagectime{shift()}))[4] + 1 == shift);
+	return ((gmtime($IkiWiki::pagectime{shift()}))[4] + 1 == shift);
 } #}}}
 
 sub match_creation_year ($$) { #{{{
-	return ((gmtime($pagectime{shift()}))[5] + 1900 == shift);
+	return ((gmtime($IkiWiki::pagectime{shift()}))[5] + 1900 == shift);
 } #}}}
 
 1