Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index b15d9f46b825a50ddd47bacff59ceb85c33edf2e..398b1a3c8eb989a59258e0a846ca0cb0a5addcb0 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -42,16 +42,8 @@ sub handle_directive {
 }
 
 sub prefix_directives {
-       my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
+       loadsetup(shift);
 
-       require IkiWiki::Setup;
-       require IkiWiki::Plugin::aggregate;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
        IkiWiki::loadplugins();
        IkiWiki::checkconfig();
        IkiWiki::loadindex();
@@ -73,11 +65,7 @@ sub prefix_directives {
 }
 
 sub indexdb {
-       my $dir=shift;
-       if (! defined $dir) {
-               usage();                
-       }
-       $config{wikistatedir}=$dir."/.ikiwiki";
+       setstatedir(shift);
 
        # Note: No lockwiki here because ikiwiki already locks it
        # before calling this.  
@@ -96,11 +84,7 @@ sub indexdb {
 }
 
 sub hashpassword {
-       my $dir=shift;
-       if (! defined $dir) {
-               usage();                
-       }
-       $config{wikistatedir}=$dir."/.ikiwiki";
+       setstatedir(shift);
 
        eval q{use IkiWiki::UserInfo};
        eval q{use Authen::Passphrase::BlowfishCrypt};
@@ -122,31 +106,16 @@ sub hashpassword {
 }
 
 sub aggregateinternal {
-       my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
-
-       require IkiWiki::Setup;
+       loadsetup(shift);
        require IkiWiki::Plugin::aggregate;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
        IkiWiki::checkconfig();
-
        IkiWiki::Plugin::aggregate::migrate_to_internal();
 }
 
 sub setupformat {
        my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
-
-       require IkiWiki::Setup;
 
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
+       loadsetup($setup);
        IkiWiki::checkconfig();
        
        # unpack old-format wrappers setting into new fields
@@ -183,14 +152,8 @@ sub setupformat {
 
 sub moveprefs {
        my $setup=shift;
-       if (! defined $setup) {
-               usage();
-       }
 
-       require IkiWiki::Setup;
-
-       %config = IkiWiki::defaultconfig();
-       IkiWiki::Setup::load($setup);
+       loadsetup($setup);
        IkiWiki::checkconfig();
 
        eval q{use IkiWiki::UserInfo};
@@ -201,10 +164,15 @@ sub moveprefs {
                foreach my $admin (@{$config{adminuser}}) {
                        my $a=IkiWiki::userinfo_get($admin, $field);
                        if (defined $a && length $a &&
-                           $a ne $orig && # might already have been moved
-                           defined $config{$field} &&
-                           length $config{$field}) {
-                                $config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
+                           # might already have been moved
+                           (! defined $orig || $a ne $orig)) {
+                               if (defined $config{$field} &&
+                                   length $config{$field}) {
+                                       $config{$field}=IkiWiki::pagespec_merge($config{$field}, $a);
+                               }
+                               else {
+                                       $config{$field}=$a;
+                               }
                        }
                }
        }
@@ -215,6 +183,53 @@ sub moveprefs {
        IkiWiki::Setup::dump($setup);
 }
 
+sub deduplinks {
+       loadsetup(shift);
+       IkiWiki::loadplugins();
+       IkiWiki::checkconfig();
+       IkiWiki::loadindex();
+       foreach my $page (keys %links) {
+               my %l;
+               $l{$_}=1 foreach @{$links{$page}};
+               $links{$page}=[keys %l]
+       }
+       IkiWiki::saveindex();
+}
+
+sub setstatedir {
+       my $dirorsetup=shift;
+
+       if (! defined $dirorsetup) {
+               usage();                
+       }
+
+       if (-d $dirorsetup) {
+               $config{wikistatedir}=$dirorsetup."/.ikiwiki";
+       }
+       elsif (-f $dirorsetup) {
+               loadsetup($dirorsetup);
+       }
+       else {
+               error("ikiwiki-transition: $dirorsetup does not exist");
+       }
+
+       if (! -d $config{wikistatedir}) {
+               error("ikiwiki-transition: $config{wikistatedir} does not exist");
+       }
+}
+       
+sub loadsetup {
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }
+
+       require IkiWiki::Setup;
+
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+}
+
 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
        print STDERR "Currently supported transition subcommands:\n";
@@ -222,8 +237,9 @@ sub usage {
        print STDERR "\taggregateinternal setupfile\n";
        print STDERR "\tsetupformat setupfile\n";
        print STDERR "\tmoveprefs setupfile\n";
-       print STDERR "\thashpassword srcdir\n";
-       print STDERR "\tindexdb srcdir\n";
+       print STDERR "\thashpassword setupfile|srcdir\n";
+       print STDERR "\tindexdb setupfile|srcdir\n";
+       print STDERR "\tdeduplinks setupfile\n";
        exit 1;
 }
 
@@ -248,6 +264,9 @@ elsif ($mode eq 'setupformat') {
 elsif ($mode eq 'moveprefs') {
        moveprefs(@ARGV);
 }
+elsif ($mode eq 'deduplinks') {
+       deduplinks(@ARGV);
+}
 else {
        usage();
 }