X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dae0f48e91304afcb6ebe0936360e51b22a56548..6424d748a4da431c244d0775d4d4e839fdd3f671:/IkiWiki/Plugin/linkmap.pm?ds=sidebyside
diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm
index 6b1609744..81ee665c8 100644
--- a/IkiWiki/Plugin/linkmap.pm
+++ b/IkiWiki/Plugin/linkmap.pm
@@ -3,14 +3,23 @@ package IkiWiki::Plugin::linkmap;
use warnings;
use strict;
-use IkiWiki;
+use IkiWiki 2.00;
use IPC::Open2;
sub import { #{{{
+ hook(type => "getsetup", id => "linkmap", call => \&getsetup);
hook(type => "preprocess", id => "linkmap", call => \&preprocess);
hook(type => "format", id => "linkmap", call => \&format);
} # }}}
+sub getsetup () { #{{{
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ },
+} #}}}
+
my $mapnum=0;
my %maps;
@@ -48,33 +57,24 @@ sub genmap ($) { #{{{
# Get all the items to map.
my %mapitems = ();
foreach my $item (keys %links) {
- if (pagespec_match($item, $params{pages})) {
- my $link=htmlpage($item);
- $link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page}));
- $mapitems{$item}=$link;
+ if (pagespec_match($item, $params{pages}, location => $params{page})) {
+ $mapitems{$item}=urlto($item, $params{destpage});
}
}
+ my $dest=$params{page}."/linkmap.png";
+
# Use ikiwiki's function to create the file, this makes sure needed
# subdirs are there and does some sanity checking.
- writefile("$params{page}.png", $config{destdir}, "");
+ will_render($params{page}, $dest);
+ writefile($dest, $config{destdir}, "");
# Run dot to create the graphic and get the map data.
- # TODO: should really add the png to renderedfiles and call
- # check_overwrite, but currently renderedfiles
- # only supports listing one file per page.
- my $tries=10;
my $pid;
- while (1) {
- eval {
- $pid=open2(*IN, *OUT, "dot -Tpng -o '$config{destdir}/$params{page}.png' -Tcmapx");
- };
- last unless $@;
- $tries--;
- if ($tries < 1) {
- return "failed to run dot: $@";
- }
- }
+ my $sigpipe=0;
+ $SIG{PIPE}=sub { $sigpipe=1 };
+ $pid=open2(*IN, *OUT, "dot -Tpng -o '$config{destdir}/$dest' -Tcmapx");
+
# open2 doesn't respect "use open ':utf8'"
binmode (IN, ':utf8');
binmode (OUT, ':utf8');
@@ -95,13 +95,16 @@ sub genmap ($) { #{{{
close OUT;
local $/=undef;
- my $ret="";
+ my $ret="";
close IN;
+
waitpid $pid, 0;
+ $SIG{PIPE}="DEFAULT";
+ error gettext("failed to run dot") if $sigpipe;
+
return $ret;
} #}}}