X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/e727d5b6e91088b0c4720f31ecafa76669979a19..a07a3d1baea183800e41caf4341f31e691a692e7:/IkiWiki/Setup/Standard.pm diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 8b0bc2279..c85069304 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -1,20 +1,33 @@ #!/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; 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 generate (@) { #{{{ - my %setup=@_; +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; + my $prefix=shift; + eval q{use Data::Dumper}; error($@) if $@; local $Data::Dumper::Terse=1; @@ -22,49 +35,35 @@ sub generate (@) { #{{{ local $Data::Dumper::Pad="\t"; local $Data::Dumper::Sortkeys=1; local $Data::Dumper::Quotekeys=0; - - my @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 {"; - - foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) { - my @setup=$IkiWiki::hooks{getsetup}{$id}{call}->(); - return unless @setup; - push @ret, "\t# $id plugin"; - while (@setup) { - my $key=shift @setup; - my %info=%{shift @setup}; - - push @ret, "\t# ".$info{description} if exists $info{description}; + # only the perl version preserves utf-8 in output + local $Data::Dumper::Useperl=1; - my $value=undef; - my $prefix="#"; - if (exists $setup{$key} && defined $setup{$key}) { - $value=$setup{$key}; - $prefix=""; - } - elsif (exists $info{default}) { - $value=$info{default}; - } - elsif (exists $info{example}) { - $value=$info{example}; + 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"; } - - my $dumpedvalue=Dumper($value); - chomp $dumpedvalue; - $dumpedvalue=~/^\t//; - push @ret, "\t$prefix$key=$dumpedvalue,"; } - push @ret, ""; + $dumpedvalue=~s/^\t//; + chomp $dumpedvalue; } - - push @ret, "}"; - return @ret; -} #}}} + + return "\t$prefix$key => $dumpedvalue,"; +} 1