X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7f243ae21ae07f94efc11fbf943b46ddafe460c0..9ef5139918dbe3f4cf0b3310c76dd31090925406:/IkiWiki/Plugin/htmltidy.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index c626250cb..da77e60f1 100644
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,32 +9,48 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 use IPC::Open2;
 
-sub import { #{{{
-	IkiWiki::hook(type => "sanitize", id => "tidy", call => \&sanitize);
-} # }}}
+sub import {
+	hook(type => "getsetup", id => "tidy", call => \&getsetup);
+	hook(type => "sanitize", id => "tidy", call => \&sanitize);
+	hook(type => "checkconfig", id => "tidy", call => \&checkconfig);
+}
 
-sub sanitize (@) { #{{{
+sub getsetup () {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+		htmltidy => {
+			type => "string",
+			description => "tidy command line",
+			safe => 0, # path
+			rebuild => undef,
+		},
+}
+
+sub checkconfig () {
+	if (! defined $config{htmltidy}) {
+		$config{htmltidy}="tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes";
+	}
+}
+
+sub sanitize (@) {
 	my %params=@_;
 
-	my $tries=10;
+	return $params{content} unless defined $config{htmltidy};
+
 	my $pid;
-	while (1) {
-		eval {
-			$pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no');
-		};
-		last unless $@;
-		$tries--;
-		if ($tries < 1) {
-			IkiWiki::debug("failed to run tidy: $@");
-			return $params{content};
-		}
-	}
+	my $sigpipe=0;
+	$SIG{PIPE}=sub { $sigpipe=1 };
+	$pid=open2(*IN, *OUT, "$config{htmltidy} 2>/dev/null");
+
 	# open2 doesn't respect "use open ':utf8'"
-	binmode (IN, ':utf8'); 
-	binmode (OUT, ':utf8'); 
+	binmode (IN, ':utf8');
+	binmode (OUT, ':utf8');
 	
 	print OUT $params{content};
 	close OUT;
@@ -44,7 +60,12 @@ sub sanitize (@) { #{{{
 	close IN;
 	waitpid $pid, 0;
 
+	$SIG{PIPE}="DEFAULT";
+	if ($sigpipe || ! defined $ret) {
+		return gettext("htmltidy failed to parse this html");
+	}
+
 	return $ret;
-} # }}}
+}
 
 1