#!/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::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;
- $setup{plugin}=$config{plugin};
- if (exists $setup{add_plugins}) {
- push @{$setup{plugin}}, @{$setup{add_plugins}};
- delete $setup{add_plugins};
- }
- if (exists $setup{exclude}) {
- push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
- }
+ "#!/usr/bin/perl",
+ "#",
+ (map { "# $_" } @_),
+ "use IkiWiki::Setup::Standard {",
+ IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+ "}"
+}
- if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
- debug(gettext("generating wrappers.."));
- my @wrappers=@{$setup{wrappers}};
- delete $setup{wrappers};
- my %startconfig=(%config);
- foreach my $wrapper (@wrappers) {
- %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
- checkconfig();
- if (! $config{cgi} && ! $config{post_commit}) {
- $config{post_commit}=1;
- }
- gen_wrapper();
- }
- %config=(%startconfig);
- }
+sub dumpline ($$$$) {
+ my $key=shift;
+ my $value=shift;
+ my $type=shift;
+ my $prefix=shift;
- foreach my $c (keys %setup) {
- next if $c eq 'syslog';
- if (defined $setup{$c}) {
- if (! ref $setup{$c}) {
- $config{$c}=possibly_foolish_untaint($setup{$c});
- }
- elsif (ref $setup{$c} eq 'ARRAY') {
- $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
- }
- elsif (ref $setup{$c} eq 'HASH') {
- foreach my $key (keys %{$setup{$c}}) {
- $config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
- }
- }
- }
- else {
- $config{$c}=undef;
- }
- }
-
- if ($config{render}) {
- commandline_render();
+ 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;
+
+ my $dumpedvalue;
+ if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
+ # avoid quotes
+ $dumpedvalue=$value;
}
- elsif (! $config{refresh}) {
- $config{rebuild}=1;
- debug(gettext("rebuilding wiki.."));
+ elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
+ # dump simple array as qw{}
+ $dumpedvalue="[qw{".join(" ", @$value)."}]";
}
else {
- debug(gettext("refreshing wiki.."));
+ $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;
}
-
- loadplugins();
- checkconfig();
- lockwiki();
- loadindex();
- refresh();
-
- debug(gettext("done"));
- saveindex();
+
+ return "\t$prefix$key => $dumpedvalue,";
}
1