X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/278ae9afea19b20058e7ed5290305ca69c71a649..522daa7ea8111482701ce222800096edaf8eb2d2:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 2420a6644..9c177e497 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,65 +1,75 @@
 #!/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.
+# Parameters to import should be all the standard ikiwiki config stuff.
 
 package IkiWiki::Setup::Standard;
 
 use warnings;
 use strict;
+use IkiWiki;
 
-sub import { #{{{
-	$IkiWiki::Setup::raw_setup=$_[1];
-} #}}}
+sub import {
+	IkiWiki::Setup::merge($_[1]);
+}
 
-sub generate (@) { #{{{
-	my %setup=@_;
+sub gendump ($$) {
+	my $class=shift;
+	my $description=shift;
 
+	"#!/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 {",
+	IkiWiki::Setup::commented_dump(\&dumpline),
+	"}";
+}
+
+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;
-
-	my @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 (sort keys %{$IkiWiki::hooks{getsetup}}) {
-		my @setup=$IkiWiki::hooks{getsetup}{$id}{call}->();
-		return unless @setup;
-		push @ret, "\t# $id plugin";
-		while (@setup) {
-			my $key=shift @setup;
-			my %info=%{shift @setup};
-	
-			push @ret, "\t# ".$info{description} if exists $info{description};
+	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 $value=undef;
-			my $prefix="#";
-			if (exists $setup{$key} && defined $setup{$key}) {
-				$value=$setup{$key};
-				$prefix="";
-			}
-			elsif (exists $info{default}) {
-				$value=$info{default};
-			}
-			elsif (exists $info{example}) {
-				$value=$info{example};
+	my $dumpedvalue;
+	if (($type eq 'boolean' || $type eq 'integer') && $value=~/^[0-9]+$/) {
+		# avoid quotes
+		$dumpedvalue=$value;
+	}
+	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";
 			}
-	
-			my $dumpedvalue=Dumper($value);
-			chomp $dumpedvalue;
-			push @ret, "\t$prefix$key=$dumpedvalue,";
 		}
-		push @ret, "";
+		$dumpedvalue=~s/^\t//;
+		chomp $dumpedvalue;
 	}
-
-	push @ret, "}";
-	return @ret;
-} #}}}
+	
+	return "\t$prefix$key => $dumpedvalue,";
+}
 
 1