refactor

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 0e091b994134fcce7d3b4d59ffd0504e9712b4f8..22bfc38a40440df88915375e2d02dd307aebe0e1 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -13,9 +13,10 @@ sub import { #{{{
        $IkiWiki::Setup::raw_setup=$_[1];
 } #}}}
 
-sub dumpline ($$$) { #{{{
+sub dumpline ($$$$) { #{{{
        my $key=shift;
        my $value=shift;
+       my $type=shift;
        my $prefix=shift;
        
        eval q{use Data::Dumper};
@@ -26,11 +27,23 @@ sub dumpline ($$$) { #{{{
        local $Data::Dumper::Sortkeys=1;
        local $Data::Dumper::Quotekeys=0;
        
-       my $dumpedvalue=Dumper($value);
-       chomp $dumpedvalue;
-       $dumpedvalue=~s/^\t//;
+       my $dumpedvalue;
+       if ($type eq 'boolean' || $type eq 'integer') {
+               # avoid quotes
+               $dumpedvalue=$value;
+       }
+       elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
+           ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{ ".join(" ", @$value)." }]";
+       }
+       else {
+               $dumpedvalue=Dumper($value);
+               chomp $dumpedvalue;
+               $dumpedvalue=~s/^\t//;
+       }
        
-       return "\t$prefix$key=$dumpedvalue,";
+       return "\t$prefix$key => $dumpedvalue,";
 } #}}}
 
 sub dumpvalues ($@) { #{{{
@@ -39,28 +52,32 @@ sub dumpvalues ($@) { #{{{
        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}, "");
+                       push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
                        delete $setup->{$key};
                }
-               elsif (exists $info{default}) {
-                       push @ret, dumpline($key, $info{default}, "#");
+               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}, "#");
+                       push @ret, dumpline($key, $info{example}, $info{type}, "#");
                }
        }
        return @ret;
 } #}}}
 
-sub dump ($) { #{{{
-       my $file=shift;
-       
+sub gendump () { #{{{
        my %setup=(%config);
        my @ret;
+       
+       push @ret, "\t# basic setup";
+       push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+       push @ret, "";
 
        foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
                # use an array rather than a hash, to preserve order
@@ -71,13 +88,6 @@ sub dump ($) { #{{{
                push @ret, "";
        }
        
-       if (%setup) {
-               push @ret, "\t# other";
-               foreach my $key (sort keys %setup) {
-                       push @ret, dumpline($key, $setup{$key}, "");
-               }
-       }
-       
        unshift @ret, "#!/usr/bin/perl
 # Setup file for ikiwiki.
 # Passing this to ikiwiki --setup will make ikiwiki generate wrappers and
@@ -88,9 +98,7 @@ sub dump ($) { #{{{
 use IkiWiki::Setup::Standard {";
        push @ret, "}";
 
-       open (OUT, ">", $file) || die "$file: $!";
-       print OUT "$_\n" foreach @ret;
-       close OUT;
+       return @ret;
 } #}}}
 
 1