X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c35444826ca47123697a8f2512866f4f99964cc4..f41448d9caf591ba369bf319297d15552be94678:/IkiWiki/Setup/Standard.pm?ds=inline

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 7512c2587..9d4732b6f 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -3,88 +3,129 @@
 # 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;
-
-sub setup_standard {
-	my %setup=%{$_[1]};
-
-	$setup{plugin}=$config{plugin};
-	if (exists $setup{add_plugins}) {
-		push @{$setup{plugin}}, @{$setup{add_plugins}};
-		delete $setup{add_plugins};
-	}
-	if (exists $setup{disable_plugins}) {
-		foreach my $plugin (@{$setup{disable_plugins}}) {
-			$setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-		}
-		delete $setup{disable_plugins};
+	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;
 	}
-	if (exists $setup{exclude}) {
-		$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+	elsif ($type eq 'string' && ref $value eq 'ARRAY' && @$value &&
+	    ! grep { /[^-A-Za-z0-9_]/ } @$value) {
+		# dump simple array as qw{}
+		$dumpedvalue="[qw{ ".join(" ", @$value)." }]";
 	}
-
-	if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
-		debug("generating wrappers..");
-		my @wrappers=@{$setup{wrappers}};
-		delete $setup{wrappers};
-		my %startconfig=(%config);
-		foreach my $wrapper (@wrappers) {
-			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-			checkconfig();
-			gen_wrapper();
+	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";
+			}
 		}
-		%config=(%startconfig);
+		$dumpedvalue=~s/^\t//;
+		chomp $dumpedvalue;
 	}
 	
-	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 (ref $setup{$c} eq 'HASH') {
-				foreach my $key (keys %{$setup{$c}}) {
-					$config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
-				}
-			}
+	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 {
-			$config{$c}=undef;
+			push @ret, dumpline($key, "", $info{type}, "#");
 		}
 	}
+	return @ret;
+} #}}}
 
-	if ($config{render}) {
-		commandline_render();
-	}
-	elsif (! $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}=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}->() };
+		}
 	}
 
-	loadplugins();
-	checkconfig();
-	lockwiki();
-	loadindex();
-	refresh();
+	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, "}";
 
-	debug("done");
-	saveindex();
-}
+	return @ret;
+} #}}}
 
 1