X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=IkiWiki%2FSetup.pm;h=b67d1a45417149758f7b6ce2cfc882ba02ed51af;hb=79f637a436509f587ee4e1d72f56cef4f59393de;hp=63659ce2e03e7147be14063bf13e24278ddab94f;hpb=6c8cf5dd571662f981227489f7c4652a1a1f10cd;p=ikiwiki.git

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 63659ce2e..b67d1a454 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -1,22 +1,67 @@
 #!/usr/bin/perl
+# Ikiwiki setup files are perl files that 'use IkiWiki::Setup::foo',
+# passing it some sort of configuration data.
+
+package IkiWiki::Setup;
 
 use warnings;
 use strict;
+use IkiWiki;
+use open qw{:utf8 :std};
 
-package IkiWiki;
+# There can be multiple modules, with different configuration styles.
+# The setup modules each convert the data into the hashes used by ikiwiki
+# internally (if it's not already in that format), and store it in
+# IkiWiki::Setup::$raw_setup, to pass it back to this module.
+our $raw_setup;
 
-sub setup () { # {{{
-	my $setup=possibly_foolish_untaint($config{setup});
+sub load ($) { # {{{
+	my $setup=IkiWiki::possibly_foolish_untaint(shift);
 	delete $config{setup};
-	open (IN, $setup) || error("read $setup: $!\n");
-	local $/=undef;
-	my $code=<IN>;
+	#translators: The first parameter is a filename, and the second
+	#translators: is a (probably not translated) error message.
+	open (IN, $setup) || error(sprintf(gettext("cannot read %s: %s"), $setup, $!));
+	my $code;
+	{
+		local $/=undef;
+		$code=<IN>;
+	}
 	($code)=$code=~/(.*)/s;
 	close IN;
 
 	eval $code;
-	error($@) if $@;
-	exit;
+	error("$setup: ".$@) if $@;
+
+	my %setup=%{$raw_setup};
+	$raw_setup=undef;
+
+	# Merge setup into existing config and untaint.
+	$setup{plugin}=$config{plugin};
+	if (exists $setup{add_plugins}) {
+		push @{$setup{plugin}}, @{$setup{add_plugins}};
+		delete $setup{add_plugins};
+	}
+	if (exists $setup{exclude}) {
+		push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
+	}
+	foreach my $c (keys %setup) {
+		if (defined $setup{$c}) {
+			if (! ref $setup{$c}) {
+				$config{$c}=IkiWiki::possibly_foolish_untaint($setup{$c});
+			}
+			elsif (ref $setup{$c} eq 'ARRAY') {
+				$config{$c}=[map { IkiWiki::possibly_foolish_untaint($_) } @{$setup{$c}}]
+			}
+			elsif (ref $setup{$c} eq 'HASH') {
+				foreach my $key (keys %{$setup{$c}}) {
+					$config{$c}{$key}=IkiWiki::possibly_foolish_untaint($setup{$c}{$key});
+				}
+			}
+		}
+		else {
+			$config{$c}=undef;
+		}
+	}
 } #}}}
 
 1