Merge remote-tracking branch 'anarcat/dev/proxy-utf8-fail'

[git.ikiwiki.info.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index a13e7805a1c5b8632651ee1b5b8897dffd336944..ea7d763bbd26435c9dfb9462e1930f4cf7920b7a 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,53 +1,72 @@
 #!/usr/bin/perl
 #!/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 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 {
 sub import {

-       IkiWiki::setup_standard(@_);
+       IkiWiki::Setup::merge($_[1]);
+}
+
+sub gendump ($@) {
+       my $class=shift;
+
+       my $thisperl = eval q{use Config; $Config{perlpath}};
+       error($@) if $@;
+
+       "#!$thisperl",
+       "#",
+       (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;

        
        

-package IkiWiki;
-
-sub setup_standard {
-       my %setup=%{$_[1]};
-
-       if (! $config{refresh}) {
-               debug("generating wrappers..");
-               my %startconfig=(%config);
-               foreach my $wrapper (@{$setup{wrappers}}) {
-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-                       checkconfig();
-                       gen_wrapper();
-               }
-               %config=(%startconfig);
-       }
-       foreach my $c (keys %setup) {
-               $config{$c}=possibly_foolish_untaint($setup{$c})
-                       if defined $setup{$c} && ! ref $setup{$c};
+       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;

        }
        }

-       if (! $config{refresh}) {
-               $config{rebuild}=1;
-               debug("rebuilding wiki..");
+       elsif (ref $value eq 'ARRAY' && @$value && ! grep { /[^\S]/ } @$value) {
+               # dump simple array as qw{}
+               $dumpedvalue="[qw{".join(" ", @$value)."}]";

        }
        else {
        }
        else {

-               debug("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;

        }
        }

-
-       checkconfig();
-       lockwiki();
-       loadindex();
-       refresh();
-
-       debug("done");
-       saveindex();
+       
+       return "\t$prefix$key => $dumpedvalue,";

 }
 
 1
 }
 
 1