table: Find links in external files in scan pass.

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

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 6524297ee6e0fa00749210a5593e70290b3913a4..599261a093d798f818942e90577ff07a86d09a44 100755 (executable)
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -i
+#!/usr/bin/perl

 use warnings;
 use strict;
 use IkiWiki;
 use warnings;
 use strict;
 use IkiWiki;


@@ -42,20 +42,42 @@ sub handle_directive {
 }
 
 sub prefix_directives {
 }
 
 sub prefix_directives {

-       $/=undef; # process whole files at once
-       
-       while (<>) {
-               s{$regex}{handle_directive($1, $2, $3, $4)}eg;
-               print;
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }
+
+       require IkiWiki::Setup;
+       require IkiWiki::Plugin::aggregate;
+
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+       IkiWiki::loadplugins();
+       IkiWiki::checkconfig();
+       IkiWiki::loadindex();
+
+       if (! %pagesources) {
+               error "ikiwiki has not built this wiki yet, cannot transition";
+       }
+
+       foreach my $page (values %pagesources) {
+               next unless defined pagetype($page) &&
+                           -f $config{srcdir}."/".$page;
+               my $content=readfile($config{srcdir}."/".$page);
+               my $oldcontent=$content;
+               $content=~s{$regex}{handle_directive($1, $2, $3, $4)}eg;
+               if ($oldcontent ne $content) {
+                       writefile($page, $config{srcdir}, $content);
+               }

        }
 }
 
 sub indexdb {
        }
 }
 
 sub indexdb {

-       $config{wikistatedir}=shift()."/.ikiwiki";
-
-       if (! defined $config{wikistatedir}) {
+       my $dir=shift;
+       if (! defined $dir) {

                usage();                
        }
                usage();                
        }

+       $config{wikistatedir}=$dir."/.ikiwiki";

 
        # Note: No lockwiki here because ikiwiki already locks it
        # before calling this.  
 
        # Note: No lockwiki here because ikiwiki already locks it
        # before calling this.  


@@ -74,12 +96,12 @@ sub indexdb {
 }
 
 sub hashpassword {
 }
 
 sub hashpassword {

-       $config{wikistatedir}=shift()."/.ikiwiki";
-
-       if (! defined $config{wikistatedir}) {
+       my $dir=shift;
+       if (! defined $dir) {

                usage();                
        }
                usage();                
        }

-       
+       $config{wikistatedir}=$dir."/.ikiwiki";
+

        eval q{use IkiWiki::UserInfo};
        eval q{use Authen::Passphrase::BlowfishCrypt};
        if ($@) {
        eval q{use IkiWiki::UserInfo};
        eval q{use Authen::Passphrase::BlowfishCrypt};
        if ($@) {


@@ -100,24 +122,113 @@ sub hashpassword {
 }
 
 sub aggregateinternal {
 }
 
 sub aggregateinternal {

-       $config{srcdir} = shift;
-       $config{wikistatedir} = $config{srcdir}."/.ikiwiki";
-       $config{htmlext} = (shift or "html");
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }

 
 

+       require IkiWiki::Setup;

        require IkiWiki::Plugin::aggregate;
 
        require IkiWiki::Plugin::aggregate;
 

+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+       IkiWiki::checkconfig();
+

        IkiWiki::Plugin::aggregate::migrate_to_internal();
        IkiWiki::Plugin::aggregate::migrate_to_internal();

+}
+
+sub setupformat {
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }

 
 

-       print "... now add aggregateinternal => 1 to your .setup file\n";
+       require IkiWiki::Setup;
+
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+       IkiWiki::checkconfig();
+       
+       # unpack old-format wrappers setting into new fields
+       my $cgi_seen=0;
+       my $rcs_seen=0;
+       foreach my $wrapper (@{$config{wrappers}}) {
+               if ($wrapper->{cgi}) {
+                       if ($cgi_seen) {
+                               die "don't know what to do with second cgi wrapper ".$wrapper->{wrapper}."\n";
+                       }
+                       $cgi_seen++;
+                       print "setting cgi_wrapper to ".$wrapper->{wrapper}."\n";
+                       $config{cgi_wrapper}=$wrapper->{wrapper};
+                       $config{cgi_wrappermode}=$wrapper->{wrappermode}
+                               if exists $wrapper->{wrappermode};
+               }
+               elsif ($config{rcs}) {
+                       if ($rcs_seen) {
+                               die "don't know what to do with second rcs wrapper ".$wrapper->{wrapper}."\n";
+                       }
+                       $rcs_seen++;
+                       print "setting $config{rcs}_wrapper to ".$wrapper->{wrapper}."\n";
+                       $config{$config{rcs}."_wrapper"}=$wrapper->{wrapper};
+                       $config{$config{rcs}."_wrappermode"}=$wrapper->{wrappermode}
+                               if exists $wrapper->{wrappermode};
+               }
+               else {
+                       die "don't know what to do with wrapper ".$wrapper->{wrapper}."\n";
+               }
+       }
+
+       IkiWiki::Setup::dump($setup);
+}
+
+sub moveprefs {
+       my $setup=shift;
+       if (! defined $setup) {
+               usage();
+       }
+
+       require IkiWiki::Setup;
+
+       %config = IkiWiki::defaultconfig();
+       IkiWiki::Setup::load($setup);
+       IkiWiki::checkconfig();
+
+       eval q{use IkiWiki::UserInfo};
+       error $@ if $@;
+
+       foreach my $field (qw{allowed_attachments locked_pages}) {
+               my $orig=$config{$field};
+               foreach my $admin (@{$config{adminuser}}) {
+                       my $a=IkiWiki::userinfo_get($admin, $field);
+                       if (defined $a && length $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;
+                               }
+                       }
+               }
+       }
+
+       my %banned=map { $_ => 1 } @{$config{banned_users}}, IkiWiki::get_banned_users();
+       $config{banned_users}=[sort keys %banned];
+
+       IkiWiki::Setup::dump($setup);

 }
 
 sub usage {
        print STDERR "Usage: ikiwiki-transition type ...\n";
        print STDERR "Currently supported transition subcommands:\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";
+       print STDERR "\tprefix_directives setupfile ...\n";
+       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";

        exit 1;
 }
 
        exit 1;
 }
 


@@ -136,6 +247,12 @@ elsif ($mode eq 'indexdb') {
 elsif ($mode eq 'aggregateinternal') {
        aggregateinternal(@ARGV);
 }
 elsif ($mode eq 'aggregateinternal') {
        aggregateinternal(@ARGV);
 }

+elsif ($mode eq 'setupformat') {
+       setupformat(@ARGV);
+}
+elsif ($mode eq 'moveprefs') {
+       moveprefs(@ARGV);
+}

 else {
        usage();
 }
 else {
        usage();
 }


@@ -193,3 +310,15 @@ sub oldloadindex {
        
        return close($in);
 }
        
        return close($in);
 }

+
+# Used to be in IkiWiki/UserInfo, but only used here now.
+sub get_banned_users () {
+       my @ret;
+       my $userinfo=userinfo_retrieve();
+       foreach my $user (keys %{$userinfo}) {
+               push @ret, $user if $userinfo->{$user}->{banned};
+       }
+       return @ret;
+}
+
+1