Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add news item for ikiwiki 3.20091009
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
graphviz.pm
diff --git
a/IkiWiki/Plugin/graphviz.pm
b/IkiWiki/Plugin/graphviz.pm
index ec48bad2c859fef49b87cce9f249113d3875a8d3..32e994d6b96c4d10dce2998db005ac22729a7ce5 100644
(file)
--- a/
IkiWiki/Plugin/graphviz.pm
+++ b/
IkiWiki/Plugin/graphviz.pm
@@
-5,18
+5,27
@@
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 => "preprocess", id => "graph", call => \&graph);
-} # }}}
+}
+
+sub getsetup () {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ },
+}
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";
@@
-29,14
+38,14
@@
sub render_graph (\%) { #{{{
# Use the sha1 of the graphviz code as part of its filename.
eval q{use Digest::SHA1};
error($@) if $@;
# Use the sha1 of the graphviz code as part of its filename.
eval q{use Digest::SHA1};
error($@) if $@;
- my $dest=$params{
dest
page}."/graph-".
+ my $dest=$params{page}."/graph-".
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
".png";
IkiWiki::possibly_foolish_untaint(Digest::SHA1::sha1_hex($src)).
".png";
- will_render($params{
dest
page}, $dest);
+ will_render($params{page}, $dest);
if (! -e "$config{destdir}/$dest") {
my $pid;
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");
@@
-55,7
+64,7
@@
sub render_graph (\%) { #{{{
waitpid $pid, 0;
$SIG{PIPE}="DEFAULT";
waitpid $pid, 0;
$SIG{PIPE}="DEFAULT";
-
return "[[graph ".gettext("failed to run graphviz")."]]" if ($sigpipe)
;
+
error gettext("failed to run graphviz") if $sigpipe
;
if (! $params{preview}) {
writefile($dest, $config{destdir}, $png, 1);
if (! $params{preview}) {
writefile($dest, $config{destdir}, $png, 1);
@@
-75,16
+84,16
@@
sub render_graph (\%) { #{{{
else {
return "<img src=\"".urlto($dest, $params{destpage})."\" />\n";
}
else {
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};
$params{prog} = "dot" unless defined $params{prog};
my %params=@_;
$params{src} = "" unless defined $params{src};
$params{type} = "digraph" unless defined $params{type};
$params{prog} = "dot" unless defined $params{prog};
-
return "[[graph ".gettext("prog not a valid graphviz program")."]]"
unless $graphviz_programs{$params{prog}};
+
error gettext("prog not a valid graphviz program")
unless $graphviz_programs{$params{prog}};
return render_graph(%params);
return render_graph(%params);
-}
# }}}
+}
1
1