]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge branch 'master' of git://git.ikiwiki.info into aggregateinternal
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:00:18 +0000 (01:00 +0100)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 15 Jul 2008 00:00:18 +0000 (01:00 +0100)
IkiWiki/Plugin/aggregate.pm
ikiwiki-transition

index f618042374acc4e561be7be446b4fd0c918db316..9da619375df515ec4e8d236d10ce7b7b5b2c2130 100644 (file)
@@ -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;
index ce081fe63f63ffe0eb22492148ff8228994fee32..6524297ee6e0fa00749210a5593e70290b3913a4 100755 (executable)
@@ -99,12 +99,25 @@ sub hashpassword {
        }
 }
 
+sub aggregateinternal {
+       $config{srcdir} = shift;
+       $config{wikistatedir} = $config{srcdir}."/.ikiwiki";
+       $config{htmlext} = (shift or "html");
+
+       require IkiWiki::Plugin::aggregate;
+
+       IkiWiki::Plugin::aggregate::migrate_to_internal();
+
+       print "... now add aggregateinternal => 1 to your .setup file\n";
+}
+
 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
        print STDERR "Currently supported transition subcommands:\n";
        print STDERR "  prefix_directives file\n";
        print STDERR "  indexdb srcdir\n";
        print STDERR "  hashpassword srcdir\n";
+       print STDERR "  aggregateinternal srcdir [htmlext]\n";
        exit 1;
 }
 
@@ -120,6 +133,9 @@ elsif ($mode eq 'hashpassword') {
 elsif ($mode eq 'indexdb') {
        indexdb(@ARGV);
 }
+elsif ($mode eq 'aggregateinternal') {
+       aggregateinternal(@ARGV);
+}
 else {
        usage();
 }