Probably a good thing to add my name used IRL + join some lines

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 71abb1cfb87cfbc737be443fa69c459846f6fcb9..c8506930475a0c28ead9e613e7cde64d982b6db9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -1,7 +1,4 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# Standard ikiwiki setup module.
-# Parameters to import should be all the standard ikiwiki config stuff,
-# plus an array of wrappers to set up.

 
 package IkiWiki::Setup::Standard;
 
 
 package IkiWiki::Setup::Standard;
 


@@ -9,10 +6,22 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

+# Parameters to import should be all the standard ikiwiki config, in a hash.

 sub import {
        IkiWiki::Setup::merge($_[1]);
 }
 
 sub import {
        IkiWiki::Setup::merge($_[1]);
 }
 

+sub gendump ($@) {
+       my $class=shift;
+
+       "#!/usr/bin/perl",
+       "#",
+       (map { "# $_" } @_),
+       "use IkiWiki::Setup::Standard {",
+       IkiWiki::Setup::commented_dump(\&dumpline, "\t"),
+       "}"
+}
+

 sub dumpline ($$$$) {
        my $key=shift;
        my $value=shift;
 sub dumpline ($$$$) {
        my $key=shift;
        my $value=shift;


@@ -57,77 +66,4 @@ sub dumpline ($$$$) {
        return "\t$prefix$key => $dumpedvalue,";
 }
 
        return "\t$prefix$key => $dumpedvalue,";
 }
 

-sub dumpvalues ($@) {
-       my $setup=shift;
-       my @ret;
-       while (@_) {
-               my $key=shift;
-               my %info=%{shift()};
-
-               next if $key eq "plugin" || $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 {
-                       push @ret, dumpline($key, "", $info{type}, "#");
-               }
-       }
-       return @ret;
-}
-
-sub gendump ($) {
-       my $description=shift;
-       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];
-               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;
-               }
-       }
-
-       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, "}";
-
-       return map { ref $_ ? $_->() : $_ } @ret;
-}
-

 1
 1