diff options
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/img.pm | 5 | ||||
| -rw-r--r-- | IkiWiki/Plugin/pagestats.pm | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index 44d67bd83..68b001671 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -44,6 +44,7 @@ sub preprocess (@) { } add_link($params{page}, $image); + # optimisation: detect scan mode, and avoid generating the image if (! defined wantarray) { return; @@ -65,6 +66,8 @@ sub preprocess (@) { my $r; if ($params{size} ne 'full') { + add_depends($params{page}, $image); + my ($w, $h) = ($params{size} =~ /^(\d*)x(\d*)$/); error sprintf(gettext('wrong size format "%s" (should be WxH)'), $params{size}) unless (defined $w && defined $h && @@ -102,8 +105,6 @@ sub preprocess (@) { $imglink = $file; } - add_depends($imglink, $params{page}); - my ($fileurl, $imgurl); if (! $params{preview}) { $fileurl=urlto($file, $params{destpage}); diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm index 8ab5d3666..874ead7e6 100644 --- a/IkiWiki/Plugin/pagestats.pm +++ b/IkiWiki/Plugin/pagestats.pm @@ -38,13 +38,22 @@ sub preprocess (@) { # Needs to update whenever a page is added or removed, so # register a dependency. add_depends($params{page}, $params{pages}); + add_depends($params{page}, $params{among}) if exists $params{among}; my %counts; my $max = 0; foreach my $page (pagespec_match_list([keys %links], $params{pages}, location => $params{page})) { use IkiWiki::Render; - $counts{$page} = scalar(IkiWiki::backlinks($page)); + + my @backlinks = IkiWiki::backlink_pages($page); + + if (exists $params{among}) { + @backlinks = pagespec_match_list(\@backlinks, + $params{among}, location => $params{page}); + } + + $counts{$page} = scalar(@backlinks); $max = $counts{$page} if $counts{$page} > $max; } @@ -63,6 +72,8 @@ sub preprocess (@) { my $res = "<div class='pagecloud'>\n"; foreach my $page (sort keys %counts) { + next unless $counts{$page} > 0; + my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)]; $res .= "<span class=\"$class\">". htmllink($params{page}, $params{destpage}, $page). |