X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/4708aeceb3ec518a00069ad7a112ab0a5596275c..63fbfcb0961e33d0e24acdee78689295c0f1faa9:/IkiWiki/Setup/Standard.pm?ds=sidebyside diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 0e640f8ac..c85069304 100644 --- 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 { #{{{ +# 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,15 +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 (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); @@ -53,61 +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{example}) { - push @ret, dumpline($key, $info{example}, $info{type}, "#"); - } - else { - push @ret, dumpline($key, "", $info{type}, "#"); - } - } - return @ret; -} #}}} - -sub gendump ($) { #{{{ - my $description=shift; - my %setup=(%config); - my @ret; - - # disable logging to syslog while dumping - $config{syslog}=0; - - push @ret, dumpvalues(\%setup, IkiWiki::getsetup()); - foreach my $pair (IkiWiki::Setup::getsetup()) { - my $plugin=$pair->[0]; - my $setup=$pair->[1]; - push @ret, "", "\t# $plugin plugin"; - push @ret, dumpvalues(\%setup, @{$setup}); - } - - 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