X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5b76fc824cf5fdf8d78afb74724a6d5453c79baa..157baef2744b4c0ffe8d7670877ebc24765e76f7:/IkiWiki/Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index 7a7683fab..48f3d4634 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -1,6 +1,8 @@
 #!/usr/bin/perl
-# Ikiwiki setup files are perl files that 'use IkiWiki::Setup::foo',
-# passing it some sort of configuration data.
+# Ikiwiki setup files can be perl files that 'use IkiWiki::Setup::foo',
+# passing it some sort of configuration data. Or, they can contain
+# the module name at the top, without the 'use', and the whole file is
+# then fed into that module.
 
 package IkiWiki::Setup;
 
@@ -10,24 +12,72 @@ use IkiWiki;
 use open qw{:utf8 :std};
 use File::Spec;
 
-sub load ($) {
-	my $setup=IkiWiki::possibly_foolish_untaint(shift);
-	$config{setupfile}=File::Spec->rel2abs($setup);
+sub load ($;$) {
+	my $file=IkiWiki::possibly_foolish_untaint(shift);
+	my $safemode=shift;
+
+	$config{setupfile}=File::Spec->rel2abs($file);
 
 	#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;
+	open (IN, $file) || error(sprintf(gettext("cannot read %s: %s"), $file, $!));
+	my $content;
 	{
 		local $/=undef;
-		$code=<IN> || error("$setup: $!");
+		$content=<IN> || error("$file: $!");
 	}
-	
-	($code)=$code=~/(.*)/s;
 	close IN;
 
-	eval $code;
-	error("$setup: ".$@) if $@;
+	if ($content=~/((?:use|require)\s+)?IkiWiki::Setup::(\w+)/) {
+		$config{setuptype}=$2;
+		if ($1) {
+			error sprintf(gettext("cannot load %s in safe mode"), $file)
+				if $safemode;
+			no warnings;
+			eval IkiWiki::possibly_foolish_untaint($content);
+			error("$file: ".$@) if $@;
+		}
+		else {
+			eval qq{require IkiWiki::Setup::$config{setuptype}};
+			error $@ if $@;
+			"IkiWiki::Setup::$config{setuptype}"->loaddump(IkiWiki::possibly_foolish_untaint($content));
+		}
+	}
+	else {
+		error sprintf(gettext("failed to parse %s"), $file);
+	}
+}
+
+sub dump ($) {
+	my $file=IkiWiki::possibly_foolish_untaint(shift);
+
+	my @header=(
+		"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.",
+	);
+
+	# Fork because dumping setup requires loading all plugins.
+	my $pid=fork();
+	if ($pid == 0) {
+		eval qq{require IkiWiki::Setup::$config{setuptype}};
+		error $@ if $@;
+		my @dump="IkiWiki::Setup::$config{setuptype}"->gendump(@header);
+	
+		open (OUT, ">", $file) || die "$file: $!";
+		print OUT "$_\n" foreach @dump;
+		close OUT;
+
+		exit 0;
+	}
+	else {
+		waitpid $pid, 0;
+		exit($? >> 8) if $? >> 8;
+		exit(1) if $?;
+	}
 }
 
 sub merge ($) {
@@ -74,6 +124,27 @@ sub merge ($) {
 	}
 }
 
+sub disabled_plugins (@) {
+	# Handles running disable hooks of plugins that were enabled
+	# previously, but got disabled when a new setup file was loaded.
+	if (exists $config{setupfile} && @_) {
+		# Fork a child to load the disabled plugins.
+		my $pid=fork();
+		if ($pid == 0) {
+			foreach my $plugin (@_) {
+				eval { IkiWiki::loadplugin($plugin, 1) };
+				if (exists $IkiWiki::hooks{disable}{$plugin}{call}) {
+					eval { $IkiWiki::hooks{disable}{$plugin}{call}->() };
+				}
+			}
+			exit(0);
+		}
+		else {
+			waitpid $pid, 0;
+		}
+	}
+}
+
 sub getsetup () {
 	# Gets all available setup data from all plugins. Returns an
 	# ordered list of [plugin, setup] pairs.
@@ -84,13 +155,15 @@ sub getsetup () {
         $config{syslog}=undef;
 
 	# Load all plugins, so that all setup options are available.
+	my %original_loaded_plugins=%IkiWiki::loaded_plugins;
 	my @plugins=IkiWiki::listplugins();
 	foreach my $plugin (@plugins) {
-		eval { IkiWiki::loadplugin($plugin) };
+		eval { IkiWiki::loadplugin($plugin, 1) };
 		if (exists $IkiWiki::hooks{checkconfig}{$plugin}{call}) {
 			my @s=eval { $IkiWiki::hooks{checkconfig}{$plugin}{call}->() };
 		}
 	}
+	%IkiWiki::loaded_plugins=%original_loaded_plugins;
 	
 	my %sections;
 	foreach my $plugin (@plugins) {
@@ -121,22 +194,79 @@ sub getsetup () {
         $config{syslog}=$syslog;
 
 	return map { sort { $a->[0] cmp $b->[0] } @{$sections{$_}} }
-		sort { # core first, then alphabetical
+		sort { # core first, other last, otherwise alphabetical
 			($b eq "core") <=> ($a eq "core")
 			   ||
+			($a eq "other") <=> ($b eq "other")
+			   ||
 			$a cmp $b
 		} keys %sections;
 }
 
-sub dump ($) {
-	my $file=IkiWiki::possibly_foolish_untaint(shift);
+sub commented_dump ($$) {
+	my $dumpline=shift;
+	my $indent=shift;
+
+	my %setup=(%config);
+	my @ret;
 	
-	require IkiWiki::Setup::Standard;
-	my @dump=IkiWiki::Setup::Standard::gendump("Setup file for ikiwiki.");
+	# disable logging to syslog while dumping
+	$config{syslog}=undef;
+
+	eval q{use Text::Wrap};
+	die $@ if $@;
+
+	my %section_plugins;
+	push @ret, commented_dumpvalues($dumpline, $indent, \%setup, IkiWiki::getsetup());
+	foreach my $pair (IkiWiki::Setup::getsetup()) {
+		my $plugin=$pair->[0];
+		my $setup=$pair->[1];
+		my %s=@{$setup};
+		my $section=$s{plugin}->{section};
+		push @{$section_plugins{$section}}, $plugin;
+		if (@{$section_plugins{$section}} == 1) {
+			push @ret, "", $indent.("#" x 70), "$indent# $section plugins",
+				sub {
+					wrap("$indent#   (", "$indent#    ",
+						join(", ", @{$section_plugins{$section}})).")"
+				},
+				$indent.("#" x 70);
+		}
 
-	open (OUT, ">", $file) || die "$file: $!";
-	print OUT "$_\n" foreach @dump;
-	close OUT;
+		my @values=commented_dumpvalues($dumpline, $indent, \%setup, @{$setup});
+		if (@values) {
+			push @ret, "", "$indent# $plugin plugin", @values;
+		}
+	}
+
+	return map { ref $_ ? $_->() : $_ } @ret;
+}
+
+sub commented_dumpvalues ($$$@) {
+	my $dumpline=shift;
+	my $indent=shift;
+	my $setup=shift;
+	my @ret;
+	while (@_) {
+		my $key=shift;
+		my %info=%{shift()};
+
+		next if $key eq "plugin" || $info{type} eq "internal";
+		
+		push @ret, "$indent# ".$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 {
+			push @ret, $dumpline->($key, "", $info{type}, "#");
+		}
+	}
+	return @ret;
 }
 
 1