use IPC::Open2;
sub import { #{{{
- IkiWiki::hook(type => "preprocess", id => "linkmap",
- call => \&preprocess);
- IkiWiki::hook(type => "format", id => "linkmap",
- call => \&format);
+ hook(type => "preprocess", id => "linkmap", call => \&preprocess);
+ hook(type => "format", id => "linkmap", call => \&format);
} # }}}
my $mapnum=0;
sub preprocess (@) { #{{{
my %params=@_;
+
$params{pages}="*" unless defined $params{pages};
# Needs to update whenever a page is added or removed, so
# register a dependency.
- IkiWiki::add_depends($params{page}, $params{pages});
+ add_depends($params{page}, $params{pages});
# Can't just return the linkmap here, since the htmlscrubber
# scrubs out all <object> tags (with good reason!)
# Get all the items to map.
my %mapitems = ();
- foreach my $item (keys %IkiWiki::links) {
- if (IkiWiki::pagespec_match($item, $params{pages})) {
- my $link=IkiWiki::htmlpage($item);
+ 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;
}
# Use ikiwiki's function to create the file, this makes sure needed
# subdirs are there and does some sanity checking.
- IkiWiki::writefile("$params{page}.png", $IkiWiki::config{destdir}, "");
+ will_render($params{page}, $params{page}.".png");
+ writefile($params{page}.".png", $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 /dev/stdin -Tpng -o '$IkiWiki::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}/$params{page}.png' -Tcmapx");
+
# open2 doesn't respect "use open ':utf8'"
binmode (IN, ':utf8');
binmode (OUT, ':utf8');
print OUT "digraph linkmap$mapnum {\n";
print OUT "concentrate=true;\n";
+ print OUT "charset=\"utf-8\";\n";
+ print OUT "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n"
+ if defined $params{width} and defined $params{height};
foreach my $item (keys %mapitems) {
print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n";
- foreach my $link (map { IkiWiki::bestlink($item, $_) } @{$IkiWiki::links{$item}}) {
+ foreach my $link (map { bestlink($item, $_) } @{$links{$item}}) {
print OUT "\"$item\" -> \"$link\";\n"
if $mapitems{$link};
}
local $/=undef;
my $ret="<object data=\"".
- IkiWiki::abs2rel("$params{page}.png", IkiWiki::dirname($params{page})).
- "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
- <IN>.
- "</object>";
+ IkiWiki::abs2rel("$params{page}.png", IkiWiki::dirname($params{page})).
+ "\" type=\"image/png\" usemap=\"#linkmap$mapnum\">\n".
+ <IN>.
+ "</object>";
close IN;
+
waitpid $pid, 0;
+ $SIG{PIPE}="DEFAULT";
+ if ($sigpipe) {
+ return "[[".gettext("linkmap failed to run dot")."]]";
+ }
+
return $ret;
} #}}}