X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/51bf0ea529c0b336ee04e54c5f2053f3ff7f00b0..0c3291d4f32efd1ccfcfca86429db67e7b1a0c35:/IkiWiki/Plugin/aggregate.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 1f09c988b..85b398063 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -16,11 +16,13 @@ my %guids;
 
 sub import { #{{{
 	hook(type => "getopt", id => "aggregate", call => \&getopt);
+	hook(type => "getsetup", id => "aggregate", call => \&getsetup);
 	hook(type => "checkconfig", id => "aggregate", call => \&checkconfig);
 	hook(type => "needsbuild", id => "aggregate", call => \&needsbuild);
 	hook(type => "preprocess", id => "aggregate", call => \&preprocess);
         hook(type => "delete", id => "aggregate", call => \&delete);
 	hook(type => "savestate", id => "aggregate", call => \&savestate);
+	hook(type => "htmlize", id => "_aggregated", call => \&htmlize);
 	if (exists $config{aggregate_webtrigger} && $config{aggregate_webtrigger}) {
 		hook(type => "cgi", id => "aggregate", call => \&cgi);
 	}
@@ -36,6 +38,28 @@ sub getopt () { #{{{
 	);
 } #}}}
 
+sub getsetup () { #{{{
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		aggregateinternal => {
+			type => "boolean",
+			example => 0,
+			description => "enable aggregation to internal pages?",
+			safe => 0, # enabling needs manual transition
+			rebuild => 0,
+		},
+		aggregate_webtrigger => {
+			type => "boolean",
+			example => 0,
+			description => "allow aggregation to be triggered via the web?",
+			safe => 1,
+			rebuild => 0,
+		},
+} #}}}
+
 sub checkconfig () { #{{{
 	if ($config{aggregate} && ! ($config{post_commit} && 
 	                             IkiWiki::commit_hook_enabled())) {
@@ -113,6 +137,12 @@ sub launchaggregation () { #{{{
 	return 1;
 } #}}}
 
+#  Pages with extension _aggregated have plain html markup, pass through.
+sub htmlize (@) { #{{{
+	my %params=@_;
+	return $params{content};
+} #}}}
+
 # Used by ikiwiki-transition aggregateinternal.
 sub migrate_to_internal { #{{{
 	if (! lockaggregate()) {
@@ -125,9 +155,11 @@ sub migrate_to_internal { #{{{
 
 	foreach my $data (values %guids) {
 		next unless $data->{page};
+		next if $data->{expired};
 		
 		$config{aggregateinternal} = 0;
 		my $oldname = pagefile($data->{page});
+		my $oldoutput = $config{destdir}."/".IkiWiki::htmlpage($data->{page});
 		
 		$config{aggregateinternal} = 1;
 		my $newname = pagefile($data->{page});
@@ -147,6 +179,11 @@ sub migrate_to_internal { #{{{
 		else {
 			debug("$oldname not found");
 		}
+		if (-e $oldoutput) {
+			require IkiWiki::Render;
+			debug("removing output file $oldoutput");
+			IkiWiki::prune($oldoutput);
+		}
 	}
 	
 	savestate();
@@ -640,7 +677,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-	return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
+	return shift().".".($config{aggregateinternal} ? "_aggregated" : $config{htmlext});
 } #}}}
 
 my $aggregatelock;