X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b7d6a49be4a5e1d9c94219392179c14dba40034a..5c0e56d149c6b33d010561f64f583e7ad1c529da:/IkiWiki/Plugin/websetup.pm

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 4c9367410..9edd22d26 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;
@@ -82,17 +86,39 @@ sub showfields ($$$@) { #{{{
 		push @show, $key, \%info;
 	}
 
+	my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
+	my %enabledfields;
+	my $shownfields=0;
+	
 	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=();
 	}
 
-	my %shownfields;
-	my %skippedfields;
-	my $section=defined $plugin ? $plugin." ".gettext("plugin") : "main";
-	
+	# show plugin toggle
+	if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
+		my $name="enable.$plugin";
+		$form->field(
+			name => $name,
+			label => "",
+			type => "checkbox",
+			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);
+		}
+		else {
+			$enabledfields{$name}=[$name, \%plugininfo];
+		}
+	}
+
+	# show plugin settings
 	while (@show) {
 		my $key=shift @show;
 		my %info=%{shift @show};
@@ -108,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") {
@@ -156,44 +182,52 @@ 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}) {
 			$form->field(name => $name, disabled => 1);
-			$skippedfields{$name}=1;
 		}
 		else {
-			$shownfields{$name}=[$key, \%info];
+			$enabledfields{$name}=[$key, \%info];
 		}
+		$shownfields++;
 	}
-
-	if (defined $plugin && (! $plugin_forced || $config{websetup_advanced})) {
-		my $name="enable.$plugin";
-		$section="plugins" unless %shownfields || (%skippedfields && $config{websetup_advanced});
-		$form->field(
-			name => $name,
-			label => "",
-			type => "checkbox",
-			options => [ [ 1 => sprintf(gettext("enable %s?"), $plugin) ] ],
-			value => $enabled,
-			fieldset => $section,
-		);
-		if ($plugin_forced) {
-			$form->field(name => $name, disabled => 1);
-		}
-		else {
-			$shownfields{$name}=[$name, \%plugininfo];
-		}
+	
+	# if no fields were shown for the plugin, drop it into the
+	# plugins fieldset
+	if (defined $plugin && (! $plugin_forced || $config{websetup_advanced}) &&
+	    ! $shownfields) {
+		$form->field(name => "enable.$plugin", fieldset => "plugins");
 	}
 
-	return %shownfields;
-} #}}}
+	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;
 
@@ -202,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 $@;
 
@@ -222,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", 
@@ -250,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
@@ -259,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;
 		}
 	}
@@ -276,71 +314,142 @@ 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};
+				}
+				else {
+					$config{$key}=$value[0];
 				}
-				$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."));
+			my $oldsetup=readfile($config{setupfile});
+			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."<pre>\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
+			close STDERR;
+			open(STDERR, ">&STDOUT");
+			my $ret=system(@command);
+			print "\n<\/pre>";
+			if ($ret != 0) {
+				print '<p class="error">'.
+					sprintf(gettext("Error: %s exited nonzero (%s). Discarding setup changes."),
+						join(" ", @command), $ret).
+					'</p>';
+				open(OUT, ">", $config{setupfile}) || error("$config{setupfile}: $!");
+				print OUT $oldsetup;
+				close OUT;
 			}
+
+			print $tail;
+			exit 0;
 		}
 	}
 
 	IkiWiki::showform($form, $buttons, $session, $cgi);
-} #}}}
+}
 
-sub sessioncgi ($$) { #{{{
+sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
 
@@ -348,9 +457,9 @@ sub sessioncgi ($$) { #{{{
 		showform($cgi, $session);
 		exit;
 	}
-} #}}}
+}
 
-sub formbuilder_setup (@) { #{{{
+sub formbuilder_setup (@) {
 	my %params=@_;
 
 	my $form=$params{form};
@@ -361,6 +470,6 @@ sub formbuilder_setup (@) { #{{{
 			exit;
 		}
 	}
-} #}}}
+}
 
 1