Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / htmltidy.pm

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index fc0d3b1d68067593851f3da8203ccdfcd87e344e..da77e60f1cb6198278e87897522fd74b553f95e9 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -15,6 +15,7 @@ use IPC::Open2;
 sub import {
        hook(type => "getsetup", id => "tidy", call => \&getsetup);
        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 getsetup () {
 }
 
 sub getsetup () {


@@ -23,15 +24,29 @@ sub getsetup () {
                        safe => 1,
                        rebuild => undef,
                },
                        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=@_;
 
 }
 
 sub sanitize (@) {
        my %params=@_;
 

+       return $params{content} unless defined $config{htmltidy};
+

        my $pid;
        my $sigpipe=0;
        $SIG{PIPE}=sub { $sigpipe=1 };
        my $pid;
        my $sigpipe=0;
        $SIG{PIPE}=sub { $sigpipe=1 };

-       $pid=open2(*IN, *OUT, 'tidy -quiet -asxhtml -utf8 --show-body-only yes --show-warnings no --tidy-mark no --markup yes 2>/dev/null');
+       $pid=open2(*IN, *OUT, "$config{htmltidy} 2>/dev/null");

 
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');
 
        # open2 doesn't respect "use open ':utf8'"
        binmode (IN, ':utf8');


@@ -47,8 +62,7 @@ sub sanitize (@) {
 
        $SIG{PIPE}="DEFAULT";
        if ($sigpipe || ! defined $ret) {
 
        $SIG{PIPE}="DEFAULT";
        if ($sigpipe || ! defined $ret) {

-               print STDERR gettext("warning: tidy failed")."\n";
-               return "";
+               return gettext("htmltidy failed to parse this html");

        }
 
        return $ret;
        }
 
        return $ret;