X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/fe6b271501d4d8ae00a012d14a8814cee5e0e55d..12eb585353660d121e48d5796d35354b66c7e522:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 9883b922a..92f887f0c 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -3,62 +3,113 @@
 # 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;
+use IkiWiki;
 
-package IkiWiki::Setup::Standard;
+sub import { #{{{
+	IkiWiki::Setup::merge($_[1]);
+} #}}}
 
-sub import {
-	IkiWiki::setup_standard(@_);
-}
+sub dumpline ($$$$) { #{{{
+	my $key=shift;
+	my $value=shift;
+	my $type=shift;
+	my $prefix=shift;
 	
-package IkiWiki;
+	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') && $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";
+			}
+		}
+		$dumpedvalue=~s/^\t//;
+		chomp $dumpedvalue;
+	}
+	
+	return "\t$prefix$key => $dumpedvalue,";
+} #}}}
 
-sub setup_standard {
-	my %setup=%{$_[1]};
+sub dumpvalues ($@) { #{{{
+	my $setup=shift;
+	my @ret;
+	while (@_) {
+		my $key=shift;
+		my %info=%{shift()};
 
-	if (! $config{refresh}) {
-		debug("generating wrappers..");
-		my %startconfig=(%config);
-		foreach my $wrapper (@{$setup{wrappers}}) {
-			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-			checkconfig();
-			gen_wrapper();
+		next if $key eq "plugin" || $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};
 		}
-		%config=(%startconfig);
-		delete $config{wrappers};
-	}
-	foreach my $c (keys %setup) {
-		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 (exists $info{example}) {
+			push @ret, dumpline($key, $info{example}, $info{type}, "#");
 		}
 		else {
-			$config{$c}=undef;
+			push @ret, dumpline($key, "", $info{type}, "#");
 		}
 	}
+	return @ret;
+} #}}}
 
-	if (! $config{refresh}) {
-		$config{rebuild}=1;
-		debug("rebuilding wiki..");
-	}
-	else {
-		debug("refreshing wiki..");
+sub gendump ($) { #{{{
+	my $description=shift;
+	my %setup=(%config);
+	my @ret;
+	
+	# disable logging to syslog while dumping
+	$config{syslog}=undef;
+
+	push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
+	foreach my $pair (IkiWiki::Setup::getsetup()) {
+		my $plugin=$pair->[0];
+		my $setup=$pair->[1];
+		my @values=dumpvalues(\%setup, @{$setup});
+		if (@values) {
+			push @ret, "", "\t# $plugin plugin", @values;
+		}
 	}
 
-	checkconfig();
-	lockwiki();
-	loadindex();
-	refresh();
+	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, "}";
 
-	debug("done");
-	saveindex();
-}
+	return @ret;
+} #}}}
 
 1