X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/52bbdbb1a5ce994c9afac253c1d9bfd94acf4d1d..63fbfcb0961e33d0e24acdee78689295c0f1faa9:/IkiWiki/Setup/Standard.pm?ds=sidebyside diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index d8547ba5f..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 { #{{{ - $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,92 +35,35 @@ 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); 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 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=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