X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/0a8fc6ddf55697a1ed1f8b277265b430ffe5350c..5643428d7d50fd7c47ab8830f050903122c5f330:/IkiWiki/Plugin/linkmap.pm diff --git a/IkiWiki/Plugin/linkmap.pm b/IkiWiki/Plugin/linkmap.pm index 2c92784c2..ac26e072e 100644 --- a/IkiWiki/Plugin/linkmap.pm +++ b/IkiWiki/Plugin/linkmap.pm @@ -3,79 +3,53 @@ package IkiWiki::Plugin::linkmap; use warnings; use strict; -use IkiWiki; +use IkiWiki 3.00; use IPC::Open2; -sub import { #{{{ - IkiWiki::hook(type => "preprocess", id => "linkmap", - call => \&preprocess); - IkiWiki::hook(type => "format", id => "linkmap", - call => \&format); -} # }}} +sub import { + hook(type => "getsetup", id => "linkmap", call => \&getsetup); + hook(type => "preprocess", id => "linkmap", call => \&preprocess); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + section => "widget", + }, +} my $mapnum=0; -my %maps; -sub preprocess (@) { #{{{ +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}); - - # Can't just return the linkmap here, since the htmlscrubber - # scrubs out all tags (with good reason!) - # Instead, insert a placeholder tag, which will be expanded during - # formatting. $mapnum++; - $maps{$mapnum}=\%params; - return "
"; -} # }}} - -sub format (@) { #{{{ - my %params=@_; - - $params{content}=~s/
<\/div>/genmap($1)/eg; - - return $params{content}; -} # }}} - -sub genmap ($) { #{{{ - my $mapnum=shift; - return "" unless exists $maps{$mapnum}; - my %params=%{$maps{$mapnum}}; + my $connected=IkiWiki::yesno($params{connected}); # 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); - $link=IkiWiki::abs2rel($link, IkiWiki::dirname($params{page})); - $mapitems{$item}=$link; - } - } + my %mapitems = map { $_ => urlto($_, $params{destpage}) } + pagespec_match_list($params{page}, $params{pages}, + # update when a page is added or removed, or its + # links change + deptype => deptype("presence", "links")); + + 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. - IkiWiki::writefile("$params{page}.png", $IkiWiki::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 /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}/$dest' -Tcmapx"); + # open2 doesn't respect "use open ':utf8'" binmode (IN, ':utf8'); binmode (OUT, ':utf8'); @@ -83,25 +57,44 @@ sub genmap ($) { #{{{ 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}; + my %shown; + my $show=sub { + my $item=shift; + if (! $shown{$item}) { + print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n"; + $shown{$item}=1; + } + }; foreach my $item (keys %mapitems) { - print OUT "\"$item\" [shape=box,href=\"$mapitems{$item}\"];\n"; - foreach my $link (map { IkiWiki::bestlink($item, $_) } @{$IkiWiki::links{$item}}) { - print OUT "\"$item\" -> \"$link\";\n" - if $mapitems{$link}; + $show->($item) unless $connected; + foreach my $link (map { bestlink($item, $_) } @{$links{$item}}) { + next unless length $link and $mapitems{$link}; + foreach my $endpoint ($item, $link) { + $show->($endpoint); + } + print OUT "\"$item\" -> \"$link\";\n"; } } print OUT "}\n"; - close OUT; + close OUT || error gettext("failed to run dot"); local $/=undef; - my $ret="\n". - . - ""; - close IN; + my $ret="\"".gettext("linkmap").\n". + ; + close IN || error gettext("failed to run dot"); + waitpid $pid, 0; + if ($?) { + error gettext("failed to run dot"); + } + $SIG{PIPE}="DEFAULT"; + error gettext("failed to run dot") if $sigpipe; + return $ret; -} #}}} +} 1