X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/62cd2e0a5d0127a13cc9af792191bcbceb36e387..3d4c32dacefaf83367215c59e35293144a9f2fe7:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9832d174e..9d8ec3851 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -7,83 +7,121 @@ package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
+use IkiWiki;
 
 sub import { #{{{
-	$IkiWiki::Setup::raw_setup=$_[1];
+	IkiWiki::Setup::merge($_[1]);
 } #}}}
 
-sub dumpline ($$$) { #{{{
+sub dumpline ($$$$) { #{{{
 	my $key=shift;
 	my $value=shift;
+	my $type=shift;
 	my $prefix=shift;
 	
-	my $dumpedvalue=Dumper($value);
-	chomp $dumpedvalue;
-	$dumpedvalue=~s/^\t//;
+	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;
+	
+	my $dumpedvalue;
+	if ($type eq 'boolean' || $type eq 'integer') {
+		# avoid quotes
+		$dumpedvalue=$value;
+	}
+	elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
+	    ! grep { /[^-A-Za-z0-9_]/ } @$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,";
+	return "\t$prefix$key => $dumpedvalue,";
 } #}}}
 
-sub dumpsetup ($@) { #{{{
+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}, "");
+			push @ret, dumpline($key, $setup->{$key}, $info{type}, "");
 			delete $setup->{$key};
 		}
-		elsif (exists $info{default}) {
-			push @ret, dumpline($key, $info{default}, "#");
-		}
 		elsif (exists $info{example}) {
-			push @ret, dumpline($key, $info{example}, "#");
+			push @ret, dumpline($key, $info{example}, $info{type}, "#");
 		}
 	}
 	return @ret;
 } #}}}
 
-sub dump (@) { #{{{
-	my %setup=@_;
-	
-	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;
-	
+sub gendump ($) { #{{{
+	my $description=shift;
+	my %setup=(%config);
 	my @ret;
-	foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) {
-		# use an array rather than a hash, to preserve order
-		my @s=$IkiWiki::hooks{getsetup}{$id}{call}->();
-		return unless @s;
-		push @ret, "\t# $id plugin";
-		push @ret, dumpsetup(\%setup, @s);
-		push @ret, "";
-	}
 	
-	if (%setup) {
-		push @ret, "\t# other";
-		foreach my $key (sort keys %setup) {
-			push @ret, dumpline($key, $setup{$key}, "");
+	# 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}->() };
 		}
 	}
-	
-	unshift @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 (@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;
 } #}}}