From 5bea644fdd9216ace2015d1e9ca85cde21689180 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 26 Jul 2008 12:46:31 -0400 Subject: add dumpsetup option; refactor --- IkiWiki/Setup/Standard.pm | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'IkiWiki/Setup/Standard.pm') diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 9832d174e..dcb278bf4 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -12,11 +12,21 @@ sub import { #{{{ $IkiWiki::Setup::raw_setup=$_[1]; } #}}} +package IkiWiki::Setup; + sub dumpline ($$$) { #{{{ my $key=shift; my $value=shift; my $prefix=shift; + eval q{use Data::Dumper}; + error($@) if $@; + local $Data::Dumper::Terse=1; + local $Data::Dumper::Indent=1; + local $Data::Dumper::Pad="\t"; + local $Data::Dumper::Sortkeys=1; + local $Data::Dumper::Quotekeys=0; + my $dumpedvalue=Dumper($value); chomp $dumpedvalue; $dumpedvalue=~s/^\t//; @@ -24,7 +34,7 @@ sub dumpline ($$$) { #{{{ return "\t$prefix$key=$dumpedvalue,"; } #}}} -sub dumpsetup ($@) { #{{{ +sub dumpvalues ($@) { #{{{ my $setup=shift; my @ret; while (@_) { @@ -47,24 +57,18 @@ sub dumpsetup ($@) { #{{{ return @ret; } #}}} -sub dump (@) { #{{{ - my %setup=@_; - - eval q{use Data::Dumper}; - error($@) if $@; - local $Data::Dumper::Terse=1; - local $Data::Dumper::Indent=1; - local $Data::Dumper::Pad="\t"; - local $Data::Dumper::Sortkeys=1; - local $Data::Dumper::Quotekeys=0; +sub dump ($) { #{{{ + my $file=shift; + my %setup=(%config); my @ret; + foreach my $id (sort keys %{$IkiWiki::hooks{getsetup}}) { # use an array rather than a hash, to preserve order my @s=$IkiWiki::hooks{getsetup}{$id}{call}->(); return unless @s; push @ret, "\t# $id plugin"; - push @ret, dumpsetup(\%setup, @s); + push @ret, dumpvalues(\%setup, @s); push @ret, ""; } @@ -84,7 +88,10 @@ sub dump (@) { #{{{ use IkiWiki::Setup::Standard {"; push @ret, "}"; - return @ret; + + open (OUT, ">", $file) || die "$file: $!"; + print OUT "$_\n" foreach @ret; + close OUT; } #}}} 1 -- cgit v1.2.3