allow multiple setup file types, and support safe parsing

[ikiwiki.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 951bcfc56febfce724d82c652f96468c227709d2..4022ff03cb14941296e03f87288e3f2e2f890130 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -82,18 +82,36 @@ sub dumpvalues ($@) {
        return @ret;
 }
 
        return @ret;
 }
 

-sub gendump ($) {
+sub gendump ($$) {
+       my $class=shift;

        my $description=shift;
        my $description=shift;

+

        my %setup=(%config);
        my @ret;
        
        # disable logging to syslog while dumping
        $config{syslog}=undef;
 
        my %setup=(%config);
        my @ret;
        
        # disable logging to syslog while dumping
        $config{syslog}=undef;
 

+       eval q{use Text::Wrap};
+       die $@ if $@;
+
+       my %section_plugins;

        push @ret, dumpvalues(\%setup, IkiWiki::getsetup());
        foreach my $pair (IkiWiki::Setup::getsetup()) {
                my $plugin=$pair->[0];
                my $setup=$pair->[1];
        push @ret, dumpvalues(\%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, "", "\t".("#" x 70), "\t# $section plugins",
+                               sub {
+                                       wrap("\t#   (", "\t#    ",
+                                               join(", ", @{$section_plugins{$section}})).")"
+                               },
+                               "\t".("#" x 70);
+               }
+

                my @values=dumpvalues(\%setup, @{$setup});
                if (@values) {
                        push @ret, "", "\t# $plugin plugin", @values;
                my @values=dumpvalues(\%setup, @{$setup});
                if (@values) {
                        push @ret, "", "\t# $plugin plugin", @values;


@@ -111,7 +129,7 @@ sub gendump ($) {
                "use IkiWiki::Setup::Standard {";
        push @ret, "}";
 
                "use IkiWiki::Setup::Standard {";
        push @ret, "}";
 

-       return @ret;
+       return map { ref $_ ? $_->() : $_ } @ret;

 }
 
 1
 }
 
 1