1 files changed, 48 insertions, 2 deletions

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index f61804237..9da619375 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -30,7 +30,10 @@ sub getopt () { #{{{
         eval q{use Getopt::Long};
 	error($@) if $@;
         Getopt::Long::Configure('pass_through');
-        GetOptions("aggregate" => \$config{aggregate});
+        GetOptions(
+		"aggregate" => \$config{aggregate},
+		"aggregateinternal!" => \$config{aggregateinternal},
+	);
 } #}}}
 
 sub checkconfig () { #{{{
@@ -110,6 +113,49 @@ sub launchaggregation () { #{{{
 	return 1;
 } #}}}
 
+sub migrate_to_internal { #{{{
+
+	if (! lockaggregate()) {
+		error("an aggregation process is already running");
+		return;
+	}
+
+	IkiWiki::lockwiki();
+	loadstate();
+
+	foreach my $data (values %guids) {
+		next unless $data->{page};
+
+		$config{aggregateinternal} = 0;
+		my $oldname = pagefile($data->{page});
+
+		$config{aggregateinternal} = 1;
+		my $newname = pagefile($data->{page});
+
+		print "I: $oldname -> $newname\n";
+		if (-e $newname) {
+			if (-e $oldname) {
+				error("$newname already exists");
+			}
+			else {
+				print STDERR 
+					"W: already renamed to $newname?\n";
+			}
+		}
+		elsif (-e $oldname) {
+			rename($oldname, $newname) || error("$!");
+		}
+		else {
+			print "W: $oldname not found\n";
+		}
+	}
+
+	savestate();
+	IkiWiki::unlockwiki;
+
+	unlockaggregate();
+} #}}}
+
 sub needsbuild (@) { #{{{
 	my $needsbuild=shift;
 	
@@ -595,7 +641,7 @@ sub pagefile ($) { #{{{
 } #}}}
 
 sub htmlfn ($) { #{{{
-	return shift().".".$config{htmlext};
+	return shift().".".($config{aggregateinternal} ? "_" : "").$config{htmlext};
 } #}}}
 
 my $aggregatelock;