po plugin: bugfix (calling function in wrong module)

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index b1418ae34743272c583e35cdbe915026a236c258..92f887f0c4c1b565f1949b963e40da94e88c08be 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -3,78 +3,113 @@
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 
 # Parameters to import should be all the standard ikiwiki config stuff,
 # plus an array of wrappers to set up.
 

+package IkiWiki::Setup::Standard;
+

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

-use IkiWiki::Wrapper;
-use IkiWiki::Render;
+use IkiWiki;

 
 

-package IkiWiki::Setup::Standard;
+sub import { #{{{
+       IkiWiki::Setup::merge($_[1]);
+} #}}}

 
 

-sub import {
-       IkiWiki::setup_standard(@_);
-}
+sub dumpline ($$$$) { #{{{
+       my $key=shift;
+       my $value=shift;
+       my $type=shift;
+       my $prefix=shift;

        
        

-package IkiWiki;
-
-sub setup_standard {
-       my %setup=%{$_[1]};
-
-       $setup{plugin}=$config{plugin};
-       if (exists $setup{add_plugins}) {
-               push @{$setup{plugin}}, @{$setup{add_plugins}};
-               delete $setup{add_plugins};
-       }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-               }
-               delete $setup{disable_plugins};
+       eval q{use Data::Dumper};
+       error($@) if $@;
+       local $Data::Dumper::Terse=1;
+       local $Data::Dumper::Indent=1;
+       local $Data::Dumper::Pad="\t";
+       local $Data::Dumper::Sortkeys=1;
+       local $Data::Dumper::Quotekeys=0;
+       
+       my $dumpedvalue;
+       if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
+               # avoid quotes
+               $dumpedvalue=$value;

        }
        }

-       if (exists $setup{exclude}) {
-               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{".join(" ", @$value)."}]";

        }
        }

-
-       debug("generating wrappers..");
-       my @wrappers=@{$setup{wrappers}};
-       delete $setup{wrappers};
-       my %startconfig=(%config);
-       foreach my $wrapper (@wrappers) {
-               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-               checkconfig();
-               gen_wrapper();
+       else {
+               $dumpedvalue=Dumper($value);
+               chomp $dumpedvalue;
+               if (length $prefix) {
+                       # add to second and subsequent lines
+                       my @lines=split(/\n/, $dumpedvalue);
+                       $dumpedvalue="";
+                       for (my $x=0; $x <= $#lines; $x++) {
+                               $lines[$x] =~ s/^\t//;
+                               $dumpedvalue.="\t".($x ? $prefix : "").$lines[$x]."\n";
+                       }
+               }
+               $dumpedvalue=~s/^\t//;
+               chomp $dumpedvalue;

        }
        }

-       %config=(%startconfig);

        
        

-       foreach my $c (keys %setup) {
-               if (defined $setup{$c}) {
-                       if (! ref $setup{$c}) {
-                               $config{$c}=possibly_foolish_untaint($setup{$c});
-                       }
-                       elsif (ref $setup{$c} eq 'ARRAY') {
-                               $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
-                       }
+       return "\t$prefix$key => $dumpedvalue,";
+} #}}}
+
+sub dumpvalues ($@) { #{{{
+       my $setup=shift;
+       my @ret;
+       while (@_) {
+               my $key=shift;
+               my %info=%{shift()};
+
+               next if $key eq "plugin" || $info{type} eq "internal";
+               
+               push @ret, "\t# ".$info{description} if exists $info{description};
+               
+               if (exists $setup->{$key} && defined $setup->{$key}) {
+                       push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
+                       delete $setup->{$key};
+               }
+               elsif (exists $info{example}) {
+                       push @ret, dumpline($key, $info{example}, $info{type}, "#");

                }
                else {
                }
                else {

-                       $config{$c}=undef;
+                       push @ret, dumpline($key, "", $info{type}, "#");

                }
        }
                }
        }

+       return @ret;
+} #}}}

 
 

-       if (! $config{refresh}) {
-               $config{rebuild}=1;
-               debug("rebuilding wiki..");
-       }
-       else {
-               debug("refreshing wiki..");
+sub gendump ($) { #{{{
+       my $description=shift;
+       my %setup=(%config);
+       my @ret;
+       
+       # disable logging to syslog while dumping
+       $config{syslog}=undef;
+
+       push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+       foreach my $pair (IkiWiki::Setup::getsetup()) {
+               my $plugin=$pair->[0];
+               my $setup=$pair->[1];
+               my @values=dumpvalues(\%setup, @{$setup});
+               if (@values) {
+                       push @ret, "", "\t# $plugin plugin", @values;
+               }

        }
 
        }
 

-       loadplugins();
-       checkconfig();
-       lockwiki();
-       loadindex();
-       refresh();
+       unshift @ret,
+               "#!/usr/bin/perl",
+               "# $description",
+               "#",
+               "# Passing this to ikiwiki --setup will make ikiwiki generate",
+               "# wrappers and build the wiki.",
+               "#",
+               "# Remember to re-run ikiwiki --setup any time you edit this file.",
+               "use IkiWiki::Setup::Standard {";
+       push @ret, "}";

 
 

-       debug("done");
-       saveindex();
-}
+       return @ret;
+} #}}}

 
 1
 
 1