X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ee1ad53c4c2710aa7ded61bdc56f3a8cce514f22..5b78246d11948e93f54ae32dd800e9adaf55a546:/IkiWiki/Plugin/aggregate.pm

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 78f8b409c..6f9c78075 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -31,22 +31,29 @@ sub getopt () { #{{{
 } #}}}
 
 sub checkconfig () { #{{{
-	my $nolock=($config{post_commit} && ! IkiWiki::commit_hook_enabled());
-	IkiWiki::lockwiki() unless $nolock;
-	loadstate();
-	if ($config{aggregate} && ! $nolock) {
+	if ($config{aggregate} && ! ($config{post_commit} && 
+	                             IkiWiki::commit_hook_enabled())) {
+		if (! IkiWiki::lockwiki(0)) {
+			debug("wiki is locked by another process, not aggregating");
+			exit 1;
+		}
+	
+		loadstate();
 		IkiWiki::loadindex();
 		aggregate();
 		expire();
 		savestate();
+		clearstate();
+
+		IkiWiki::unlockwiki();
 	}
-	IkiWiki::unlockwiki() unless $nolock;
 } #}}}
 
 sub filter (@) { #{{{
 	my %params=@_;
 	my $page=$params{page};
 
+	loadstate(); # if not already loaded
 	# Mark all feeds originating on this page as removable;
 	# preprocess will unmark those that still exist.
 	remove_feeds($page);
@@ -117,10 +124,12 @@ sub delete (@) { #{{{
 	}
 } #}}}
 
+my $state_loaded=0;
 sub loadstate () { #{{{
+	return if $state_loaded;
 	if (-e "$config{wikistatedir}/aggregate") {
-		open (IN, "$config{wikistatedir}/aggregate" ||
-			die "$config{wikistatedir}/aggregate: $!");
+		open(IN, "$config{wikistatedir}/aggregate") ||
+			die "$config{wikistatedir}/aggregate: $!";
 		while (<IN>) {
 			$_=IkiWiki::possibly_foolish_untaint($_);
 			chomp;
@@ -148,6 +157,8 @@ sub loadstate () { #{{{
 		}
 
 		close IN;
+		
+		$state_loaded=1;
 	}
 } #}}}
 
@@ -199,6 +210,12 @@ sub savestate () { #{{{
 		error("rename $newfile: $!", $cleanup);
 } #}}}
 
+sub clearstate () { #{{{
+	%feeds=();
+	%guids=();
+	$state_loaded=0;
+} #}}}
+
 sub expire () { #{{{
 	foreach my $feed (values %feeds) {
 		next unless $feed->{expireage} || $feed->{expirecount};
@@ -458,7 +475,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-	return shift().".html";
+	return shift().".".$config{htmlext};
 } #}}}
 
 1