Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/htmltidy.pm b/IkiWiki/Plugin/htmltidy.pm
index 906c677dc1302391eebd9266d74aea20fe5b1d9c..da77e60f1cb6198278e87897522fd74b553f95e9 100644 (file)
--- a/IkiWiki/Plugin/htmltidy.pm
+++ b/IkiWiki/Plugin/htmltidy.pm
@@ -9,32 +9,48 @@ package IkiWiki::Plugin::htmltidy;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 use IPC::Open2;
 
 use IPC::Open2;
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "tidy", call => \&getsetup);

        hook(type => "sanitize", id => "tidy", call => \&sanitize);
        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 %params=@_;
 

-       my $tries=10;
+       return $params{content} unless defined $config{htmltidy};
+

        my $pid;
        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) {
-                       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'"
        # 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;
        
        print OUT $params{content};
        close OUT;


@@ -44,7 +60,12 @@ sub sanitize (@) { #{{{
        close IN;
        waitpid $pid, 0;
 
        close IN;
        waitpid $pid, 0;
 

+       $SIG{PIPE}="DEFAULT";
+       if ($sigpipe || ! defined $ret) {
+               return gettext("htmltidy failed to parse this html");
+       }
+

        return $ret;
        return $ret;

-} # }}}
+}

 
 1
 
 1