X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1a37848346fd4853e8961e81d576906f4a5cab78..98f0d672dfcbc178b80a2d5f9a8b2f2633c8f039:/IkiWiki/Plugin/websetup.pm?ds=sidebyside diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index dec360d68..95d044c08 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -3,18 +3,22 @@ package IkiWiki::Plugin::websetup; use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; -sub import { #{{{ +sub import { hook(type => "getsetup", id => "websetup", call => \&getsetup); hook(type => "checkconfig", id => "websetup", call => \&checkconfig); hook(type => "sessioncgi", id => "websetup", call => \&sessioncgi); hook(type => "formbuilder_setup", id => "websetup", call => \&formbuilder_setup); -} # }}} +} -sub getsetup () { #{{{ +sub getsetup () { return + plugin => { + safe => 1, + rebuild => 0, + }, websetup_force_plugins => { type => "string", example => [], @@ -29,15 +33,15 @@ sub getsetup () { #{{{ safe => 0, rebuild => 0, }, -} #}}} +} -sub checkconfig () { #{{{ +sub checkconfig () { if (! exists $config{websetup_show_unsafe}) { $config{websetup_show_unsafe}=1; } -} #}}} +} -sub formatexample ($$) { #{{{ +sub formatexample ($$) { my $example=shift; my $value=shift; @@ -50,9 +54,9 @@ sub formatexample ($$) { #{{{ else { return ""; } -} #}}} +} -sub showfields ($$$@) { #{{{ +sub showfields ($$$@) { my $form=shift; my $plugin=shift; my $enabled=shift; @@ -89,9 +93,10 @@ sub showfields ($$$@) { #{{{ my $plugin_forced=defined $plugin && (! $plugininfo{safe} || (exists $config{websetup_force_plugins} && grep { $_ eq $plugin } @{$config{websetup_force_plugins}})); if ($plugin_forced && ! $enabled) { - # plugin is forced disabled, so skip its configuration + # plugin is forced disabled, so skip its settings @show=(); } + # show plugin toggle if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) { my $name="enable.$plugin"; @@ -99,10 +104,12 @@ sub showfields ($$$@) { #{{{ name => $name, label => "", type => "checkbox", - options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ], - value => $enabled, fieldset => $section, + options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ]] ); + if (! $form->submitted) { + $form->field(name => $name, value => $enabled); + } if ($plugin_forced) { $form->field(name => $name, disabled => 1); } @@ -111,6 +118,7 @@ sub showfields ($$$@) { #{{{ } } + # show plugin settings while (@show) { my $key=shift @show; my %info=%{shift @show}; @@ -126,12 +134,12 @@ sub showfields ($$$@) { #{{{ } # multiple plugins can have the same field - my $name=defined $plugin ? $plugin.".".$key : $key; + my $name=defined $plugin ? $plugin.".".$key : $section.".".$key; my $value=$config{$key}; - if ($info{safe} && (ref $config{$key} eq 'ARRAY' || ref $info{example} eq 'ARRAY')) { - push @{$value}, "", ""; # blank items for expansion + if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) { + $value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion } if ($info{type} eq "string") { @@ -174,10 +182,12 @@ sub showfields ($$$@) { #{{{ name => $name, label => "", type => "checkbox", - value => $value, options => [ [ 1 => $description ] ], fieldset => $section, ); + if (! $form->submitted) { + $form->field(name => $name, value => $value); + } } if (! $info{safe}) { @@ -197,9 +207,27 @@ sub showfields ($$$@) { #{{{ } return %enabledfields; -} #}}} +} + +sub enable_plugin ($) { + my $plugin=shift; + + $config{disable_plugins}=[grep { $_ ne $plugin } @{$config{disable_plugins}}]; + push @{$config{add_plugins}}, $plugin; +} + +sub disable_plugin ($) { + my $plugin=shift; + + if (grep { $_ eq $plugin } @{$config{add_plugins}}) { + $config{add_plugins}=[grep { $_ ne $plugin } @{$config{add_plugins}}]; + } + else { + push @{$config{disable_plugins}}, $plugin; + } +} -sub showform ($$) { #{{{ +sub showform ($$) { my $cgi=shift; my $session=shift; @@ -208,6 +236,10 @@ sub showform ($$) { #{{{ error(gettext("you are not logged in as an admin")); } + if (! exists $config{setupfile}) { + error(gettext("setup file for this wiki is not known")); + } + eval q{use CGI::FormBuilder}; error($@) if $@; @@ -228,6 +260,10 @@ sub showform ($$) { #{{{ template => {type => 'div'}, stylesheet => IkiWiki::baseurl()."style.css", ); + + $form->field(name => "do", type => "hidden", value => "setup", + force => 1); + $form->field(name => "rebuild_asked", type => "hidden"); if ($form->submitted eq 'Basic Mode') { $form->field(name => "showadvanced", type => "hidden", @@ -256,8 +292,6 @@ sub showform ($$) { #{{{ }); IkiWiki::decode_form_utf8($form); - $form->field(name => "do", type => "hidden", value => "setup", - force => 1); my %fields=showfields($form, undef, undef, IkiWiki::getsetup()); # record all currently enabled plugins before all are loaded @@ -265,14 +299,12 @@ sub showform ($$) { #{{{ # per-plugin setup require IkiWiki::Setup; - my %plugins=map { $_ => 1 } IkiWiki::listplugins(); foreach my $pair (IkiWiki::Setup::getsetup()) { my $plugin=$pair->[0]; my $setup=$pair->[1]; my %shown=showfields($form, $plugin, $enabled_plugins{$plugin}, @{$setup}); if (%shown) { - delete $plugins{$plugin}; $fields{$_}=$shown{$_} foreach keys %shown; } } @@ -282,71 +314,136 @@ sub showform ($$) { #{{{ return; } elsif (($form->submitted eq 'Save Setup' || $form->submitted eq 'Rebuild Wiki') && $form->validate) { + # Push values from form into %config, avoiding unnecessary + # changes, and keeping track of which changes need a + # rebuild. my %rebuild; foreach my $field (keys %fields) { - if ($field=~/^enable\./) { - # rebuild is overkill for many plugins, - # but no good way to tell which - $rebuild{$field}=1; # TODO only if state changed tho - # TODO plugin enable/disable - next; - } - my %info=%{$fields{$field}->[1]}; my $key=$fields{$field}->[0]; my @value=$form->field($field); - + if (! @value) { + @value=0; + } + if (! $info{safe}) { error("unsafe field $key"); # should never happen } - - next unless @value; - # Avoid setting fields to empty strings, - # if they were not set before. - next if ! defined $config{$key} && ! grep { length $_ } @value; + + if (exists $info{rebuild} && + ($info{rebuild} || ! defined $info{rebuild})) { + $rebuild{$field}=$info{rebuild}; + } + + if ($field=~/^enable\.(.*)/) { + my $plugin=$1; + $value[0]=0 if ! length $value[0]; + if ($value[0] != exists $enabled_plugins{$plugin}) { + if ($value[0]) { + enable_plugin($plugin); + } + else { + disable_plugin($plugin); + + } + } + else { + delete $rebuild{$field}; + } + next; + } if (ref $config{$key} eq "ARRAY" || ref $info{example} eq "ARRAY") { - if ($info{rebuild} && (! defined $config{$key} || (@{$config{$key}}) != (@value))) { - $rebuild{$field}=1; + @value=sort grep { length $_ } @value; + my @oldvalue=sort grep { length $_ } + (defined $config{$key} ? @{$config{$key}} : ()); + if ((@oldvalue) == (@value)) { + delete $rebuild{$field}; + } + else { + $config{$key}=\@value; } - $config{$key}=\@value; } elsif (ref $config{$key} || ref $info{example}) { error("complex field $key"); # should never happen } else { - if ($info{rebuild} && (! defined $config{$key} || $config{$key} ne $value[0])) { - $rebuild{$field}=1; + if (defined $config{$key} && $config{$key} eq $value[0]) { + delete $rebuild{$field}; + } + elsif (! defined $config{$key} && ! length $value[0]) { + delete $rebuild{$field}; + } + elsif ((! defined $config{$key} || ! $config{$key}) && + ! $value[0] && $info{type} eq "boolean") { + delete $rebuild{$field}; } - $config{$key}=$value[0]; - } + else { + $config{$key}=$value[0]; + } + } } - - if (%rebuild && $form->submitted eq 'Save Setup') { - $form->text(gettext("The configuration changes shown below require a wiki rebuild to take effect.")); + + if (%rebuild && ! $form->field("rebuild_asked")) { + my $required=0; foreach my $field ($form->field) { - next if $rebuild{$field}; - $form->field(name => $field, type => "hidden", - force => 1); + $required=1 if $rebuild{$field}; + next if exists $rebuild{$field}; + $form->field(name => $field, type => "hidden"); + } + if ($required) { + $form->text(gettext("The configuration changes shown below require a wiki rebuild to take effect.")); + $buttons=["Rebuild Wiki", "Cancel"]; } + else { + $form->text(gettext("For the configuration changes shown below to fully take effect, you may need to rebuild the wiki.")); + $buttons=["Rebuild Wiki", "Save Setup", "Cancel"]; + } + $form->field(name => "rebuild_asked", value => 1, force => 1); $form->reset(0); # doesn't really make sense here - $buttons=["Rebuild Wiki", "Cancel"]; } else { - # TODO save to real path - IkiWiki::Setup::dump("/tmp/s"); - $form->text(gettext("Setup saved.")); + IkiWiki::Setup::dump($config{setupfile}); + + IkiWiki::saveindex(); + IkiWiki::unlockwiki(); + + # Print the top part of a standard misctemplate, + # then show the rebuild or refresh. + my $divider="xxx"; + my $html=IkiWiki::misctemplate("setup", $divider); + IkiWiki::printheader($session); + my ($head, $tail)=split($divider, $html, 2); + print $head."
\n";
+
+			my @command;
+			if ($form->submitted eq 'Rebuild Wiki') {
+				@command=("ikiwiki", "-setup", $config{setupfile},
+                                        "-rebuild", "-v");
+			}
+			else {
+				@command=("ikiwiki", "-setup", $config{setupfile},
+					"-refresh", "-wrappers", "-v");
+			}
 
-			if (%rebuild) {
-				# TODO rebuild
+			my $ret=system(@command);
+			print "\n
";
+			if ($ret != 0) {
+				print '
'.
+					sprintf(gettext("
Error: %s exited nonzero (%s)"),
+						join(" ", @command), $ret).
+					'
';
 			}
+
+			print $tail;			
+			exit 0;
 		}
 	}
 
 	IkiWiki::showform($form, $buttons, $session, $cgi);
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
@@ -354,9 +451,9 @@ sub sessioncgi ($$) { #{{{
 		showform($cgi, $session);
 		exit;
 	}
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -367,6 +464,6 @@ sub formbuilder_setup (@) { #{{{
 			exit;
 		}
 	}
-} #}}}
+}
 
 1