X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9be28d7865a335a5e0f3d62a3e96178a6dc74a1b..414ccfb1e298a722d2afa8b8540ca84dc1ccc6f2:/IkiWiki/Setup/Standard.pm?ds=inline

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9d4732b6f..ea7d763bb 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,26 @@ use warnings;
 use strict;
 use IkiWiki;
 
-sub import { #{{{
+# 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;
+
+	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;
@@ -26,16 +38,17 @@ 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);
@@ -54,78 +67,6 @@ sub dumpline ($$$$) { #{{{
 	}
 	
 	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{example}) {
-			push @ret, dumpline($key, $info{example}, $info{type}, "#");
-		}
-		else {
-			push @ret, dumpline($key, "", $info{type}, "#");
-		}
-	}
-	return @ret;
-} #}}}
-
-sub gendump ($) { #{{{
-	my $description=shift;
-	my %setup=(%config);
-	my @ret;
-	
-	# disable logging to syslog while dumping
-	$config{syslog}=0;
-
-	push @ret, "\t# basic setup";
-	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
-
-	# Load all plugins, so that all setup options are available.
-	# (But skip a few problematic external demo plugins.)
-	my @plugins=grep { ! /^(externaldemo|pythondemo|\Q$config{rcs}\E)$/ }
-		sort(IkiWiki::listplugins());
-	unshift @plugins, $config{rcs} if $config{rcs}; # rcs plugin 1st
-	foreach my $plugin (@plugins) {
-		eval { IkiWiki::loadplugin($plugin) };
-		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
-			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
-		}
-	}
-
-	foreach my $id (@plugins) {
-		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, "", "\t# $id plugin";
-			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