X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5513fb46543f28e531ed4ac0826e4651b10af702..42b06a462f5e6271b3df20051aa41cb59f416f3c:/IkiWiki/Setup/Standard.pm diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index d5135f3eb..c85069304 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -1,47 +1,69 @@ #!/usr/bin/perl -# Standard ikiwiki setup module. -# Parameters to import should be all the standard ikiwiki config stuff, -# plus hashes for cgiwrapper and svnwrapper, which specify any differing -# config stuff for them and cause the wrappers to be made. + +package IkiWiki::Setup::Standard; use warnings; use strict; -use IkiWiki::Wrapper; -use IkiWiki::Render; - -package IkiWiki::Setup::Standard; +use IkiWiki; +# Parameters to import should be all the standard ikiwiki config, in a hash. sub import { - IkiWiki::setup_standard(@_); + IkiWiki::Setup::merge($_[1]); } - -package IkiWiki; -sub setup_standard { - my %setup=%{$_[1]}; +sub gendump ($@) { + my $class=shift; - debug("generating wrappers.."); - my %startconfig=(%config); - foreach my $wrapper (@{$setup{wrappers}}) { - %config=(%startconfig, verbose => 0, %setup, %{$wrapper}); - checkoptions(); - gen_wrapper(); - } - %config=(%startconfig); + "#!/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; + local $Data::Dumper::Indent=1; + 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; - debug("rebuilding wiki.."); - foreach my $c (keys %setup) { - $config{$c}=possibly_foolish_untaint($setup{$c}) - if defined $setup{$c} && ! ref $setup{$c}; + my $dumpedvalue; + if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) { + # avoid quotes + $dumpedvalue=$value; } - $config{rebuild}=1; - - checkoptions(); - lockwiki(); - refresh(); - - debug("done"); - saveindex(); + 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"; + } + } + $dumpedvalue=~s/^\t//; + chomp $dumpedvalue; + } + + return "\t$prefix$key => $dumpedvalue,"; } 1