make use of precompiled regex objects

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

diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm
index 20b419413094f5f7dbbbd16ec78efca947da3e01..4ed8b89f165847832762408c05b0abedc21aaf6c 100644 (file)
--- a/IkiWiki/Plugin/graphviz.pm
+++ b/IkiWiki/Plugin/graphviz.pm
@@ -5,27 +5,28 @@ package IkiWiki::Plugin::graphviz;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

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

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "graphviz", call => \&getsetup);
        hook(type => "preprocess", id => "graph", call => \&graph);
        hook(type => "getsetup", id => "graphviz", call => \&getsetup);
        hook(type => "preprocess", id => "graph", call => \&graph);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 1,
                        rebuild => undef,
        return
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
                },

-} #}}}
+}

 
 my %graphviz_programs = (
        "dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );
 
 
 my %graphviz_programs = (
        "dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1
 );
 

-sub render_graph (\%) { #{{{
+sub render_graph (\%) {

        my %params = %{(shift)};
 
        my $src = "$params{type} g {\n";
        my %params = %{(shift)};
 
        my $src = "$params{type} g {\n";


@@ -36,16 +37,16 @@ sub render_graph (\%) { #{{{
        $src .= "}\n";
 
        # Use the sha1 of the graphviz code as part of its filename.
        $src .= "}\n";
 
        # Use the sha1 of the graphviz code as part of its filename.

-       eval q{use Digest::SHA1};
+       eval q{use Digest::SHA};

        error($@) if $@;
        my $dest=$params{page}."/graph-".
        error($@) if $@;
        my $dest=$params{page}."/graph-".

-               IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
+               IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)).

                ".png";
        will_render($params{page}, $dest);
 
        if (! -e "$config{destdir}/$dest") {
                my $pid;
                ".png";
        will_render($params{page}, $dest);
 
        if (! -e "$config{destdir}/$dest") {
                my $pid;

-               my $sigpipe=0;;
+               my $sigpipe=0;

                $SIG{PIPE}=sub { $sigpipe=1 };
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 
                $SIG{PIPE}=sub { $sigpipe=1 };
                $pid=open2(*IN, *OUT, "$params{prog} -Tpng");
 


@@ -70,7 +71,8 @@ sub render_graph (\%) { #{{{
                        writefile($dest, $config{destdir}, $png, 1);
                }
                else {
                        writefile($dest, $config{destdir}, $png, 1);
                }
                else {

-                       # can't write the file, so embed it in a data uri
+                       # in preview mode, embed the image in a data uri
+                       # to avoid temp file clutter

                        eval q{use MIME::Base64};
                        error($@) if $@;
                        return "<img src=\"data:image/png;base64,".
                        eval q{use MIME::Base64};
                        error($@) if $@;
                        return "<img src=\"data:image/png;base64,".


@@ -78,15 +80,10 @@ sub render_graph (\%) { #{{{
                }
        }
 
                }
        }
 

-       if ($params{preview}) {
-               return "<img src=\"".urlto($dest, "")."\" />\n";
-       }
-       else {
-               return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
-       }
-} #}}}
+       return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
+}

 
 

-sub graph (@) { #{{{
+sub graph (@) {

        my %params=@_;
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};
        my %params=@_;
        $params{src} = "" unless defined $params{src};
        $params{type} = "digraph" unless defined $params{type};


@@ -94,6 +91,6 @@ sub graph (@) { #{{{
        error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
        return render_graph(%params);
        error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}};
 
        return render_graph(%params);

-} # }}}
+}

 
 1
 
 1