Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9832d174ea41639900a627bdf686669567cd1d83..e6bff2826ff73497385d1dbd332c2bb842fc110d 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -7,83 +7,110 @@ package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use IkiWiki;

 
 sub import { #{{{
 
 sub import { #{{{

-       $IkiWiki::Setup::raw_setup=$_[1];
+       IkiWiki::Setup::merge($_[1]);

 } #}}}
 
 } #}}}
 

-sub dumpline ($$$) { #{{{
+sub dumpline ($$$$) { #{{{

        my $key=shift;
        my $value=shift;
        my $key=shift;
        my $value=shift;

+       my $type=shift;

        my $prefix=shift;
        
        my $prefix=shift;
        

-       my $dumpedvalue=Dumper($value);
-       chomp $dumpedvalue;
-       $dumpedvalue=~s/^\t//;
+       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;
+       # only the perl version preserves utf-8 in output
+       local $Data::Dumper::Useperl=1;

        
        

-       return "\t$prefix$key=$dumpedvalue,";
+       my $dumpedvalue;
+       if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
+               # avoid quotes
+               $dumpedvalue=$value;
+       }
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{".join(" ", @$value)."}]";
+       }
+       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;
+       }
+       
+       return "\t$prefix$key => $dumpedvalue,";

 } #}}}
 
 } #}}}
 

-sub dumpsetup ($@) { #{{{
+sub dumpvalues ($@) { #{{{

        my $setup=shift;
        my @ret;
        while (@_) {
                my $key=shift;
                my %info=%{shift()};
        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, "\t# ".$info{description} if exists $info{description};
                
                if (exists $setup->{$key} && defined $setup->{$key}) {

-                       push @ret, dumpline($key, $setup->{$key}, "");
+                       push @ret, dumpline($key, $setup->{$key}, $info{type}, "");

                        delete $setup->{$key};
                }
                        delete $setup->{$key};
                }

-               elsif (exists $info{default}) {
-                       push @ret, dumpline($key, $info{default}, "#");
-               }

                elsif (exists $info{example}) {
                elsif (exists $info{example}) {

-                       push @ret, dumpline($key, $info{example}, "#");
+                       push @ret, dumpline($key, $info{example}, $info{type}, "#");
+               }
+               else {
+                       push @ret, dumpline($key, "", $info{type}, "#");

                }
        }
        return @ret;
 } #}}}
 
                }
        }
        return @ret;
 } #}}}
 

-sub dump (@) { #{{{
-       my %setup=@_;
-       
-       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;
-       
+sub gendump ($) { #{{{
+       my $description=shift;
+       my %setup=(%config);

        my @ret;
        my @ret;

-       foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
-               # use an array rather than a hash, to preserve order
-               my @s=$IkiWiki::hooks{getsetup}{$id}{call}->();
-               return unless @s;
-               push @ret, "\t# $id plugin";
-               push @ret, dumpsetup(\%setup, @s);
-               push @ret, "";
-       }

        
        

-       if (%setup) {
-               push @ret, "\t# other";
-               foreach my $key (sort keys %setup) {
-                       push @ret, dumpline($key, $setup{$key}, "");
+       # 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;

                }
        }
                }
        }

-       
-       unshift @ret, "#!/usr/bin/perl
-# Setup file for ikiwiki.
-# 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 {";
+       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, "}";
        push @ret, "}";

+

        return @ret;
 } #}}}
 
        return @ret;
 } #}}}