From 0b6dd9247bd442560ab740051f0e60b22bf2dccc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 2 Aug 2008 13:38:45 -0400 Subject: refactor --- IkiWiki/Setup.pm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) (limited to 'IkiWiki/Setup.pm') diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index c2fd59b21..73e32447c 100644 --- a/IkiWiki/Setup.pm +++ b/IkiWiki/Setup.pm @@ -28,9 +28,9 @@ sub load ($) { # {{{ } #}}} sub merge ($) { + # Merge setup into existing config and untaint. my %setup=%{shift()}; - # Merge setup into existing config and untaint. if (exists $setup{add_plugins}) { push @{$setup{add_plugins}}, @{$config{add_plugins}}; } @@ -71,6 +71,35 @@ sub merge ($) { } } #}}} +sub getsetup () { #{{{ + # Gets all available setup data from all plugins. Returns an ordered list of + # [plugin, setup] pairs. + my @ret; + + # 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}->() }; + } + } + + foreach my $plugin (@plugins) { + if (exists $IkiWiki::hooks{getsetup}{$plugin}{call}) { + # use an array rather than a hash, to preserve order + my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() }; + next unless @s; + push @ret, [ $plugin, \@s ], + } + } + + return @ret; +} #}}} + sub dump ($) { #{{{ my $file=IkiWiki::possibly_foolish_untaint(shift); -- cgit v1.2.3