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

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d1c53c0645c242dd5c3c4974156d66c00607f819..c8506930475a0c28ead9e613e7cde64d982b6db9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.
 
 package IkiWiki::Setup::Standard;
 
@@ -9,11 +6,23 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
-       $IkiWiki::Setup::raw_setup=$_[1];
-} #}}}
+# Parameters to import should be all the standard ikiwiki config, in a hash.
+sub import {
+       IkiWiki::Setup::merge($_[1]);
+}
 
-sub dumpline ($$$$) { #{{{
+sub gendump ($@) {
+       my $class=shift;
+
+       "#!/usr/bin/perl",
+       "#",
+       (map { "# $_" } @_),
+       "use IkiWiki::Setup::Standard {",
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+       "}"
+}
+
+sub dumpline ($$$$) {
        my $key=shift;
        my $value=shift;
        my $type=shift;
@@ -26,16 +35,17 @@ sub dumpline ($$$$) { #{{{
        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;
        
        my $dumpedvalue;
-       if ($type eq 'boolean' || $type eq 'integer') {
+       if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
                # avoid quotes
                $dumpedvalue=$value;
        }
-       elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
-           ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
                # dump simple array as qw{}
-               $dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+               $dumpedvalue="[qw{".join(" ", @$value)."}]";
        }
        else {
                $dumpedvalue=Dumper($value);
@@ -54,74 +64,6 @@ sub dumpline ($$$$) { #{{{
        }
        
        return "\t$prefix$key => $dumpedvalue,";
-} #}}}
-
-sub dumpvalues ($@) { #{{{
-       my $setup=shift;
-       my @ret;
-       while (@_) {
-               my $key=shift;
-               my %info=%{shift()};
-
-               next if $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{default} && defined $info{default}) {
-                       push @ret, dumpline($key, $info{default}, $info{type}, "#");
-               }
-               elsif (exists $info{example}) {
-                       push @ret, dumpline($key, $info{example}, $info{type}, "#");
-               }
-       }
-       return @ret;
-} #}}}
-
-sub gendump ($) { #{{{
-       my $description=shift;
-       my %setup=(%config);
-       my @ret;
-       
-       push @ret, "\t# basic setup";
-       push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
-
-       # Load all plugins, so that all setup options are available.
-       my @plugins=grep { ! /externaldemo|pythondemo/ } sort(IkiWiki::listplugins());
-       foreach my $plugin (@plugins) {
-               eval { IkiWiki::loadplugin($plugin) };
-               if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
-                       my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
-               }
-       }
-       unshift @plugins, $config{rcs} if $config{rcs};
-
-       foreach my $id (@plugins) {
-               my $title="\t# $id".($id ne $config{rcs} ? " plugin" : "");
-               if (exists $IkiWiki::hooks{getsetup}{$id}{call}) {
-                       # use an array rather than a hash, to preserve order
-                       my @s=eval { $IkiWiki::hooks{getsetup}{$id}{call}->() };
-                       next unless @s;
-                       push @ret, "", $title;
-                       push @ret, dumpvalues(\%setup, @s);
-               }
-       }
-       
-       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, "}";
-
-       return @ret;
-} #}}}
+}
 
 1