Merge commit 'remotes/smcv/ready/among'

[git.ikiwiki.info.git] / IkiWiki / Plugin / pagestats.pm

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index cdde43628d7997eb1ac442bc5c5f0d9b2a3e0982..874ead7e6de669c1d33c66b74984ef90504f9b8e 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -12,16 +12,25 @@ package IkiWiki::Plugin::pagestats;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "pagestats", call => \&getsetup);
        hook(type => "preprocess", id => "pagestats", call => \&preprocess);
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        my $style = ($params{style} or 'cloud');
@@ -29,15 +38,23 @@ 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 (keys %links) {
-               if (pagespec_match($page, $params{pages}, location => $params{page})) {
-                       use IkiWiki::Render;
-                       $counts{$page} = scalar(IkiWiki::backlinks($page));
-                       $max = $counts{$page} if $counts{$page} > $max;
+       foreach my $page (pagespec_match_list([keys %links],
+                       $params{pages}, location => $params{page})) {
+               use IkiWiki::Render;
+
+               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;
        }
 
        if ($style eq 'table') {
@@ -49,11 +66,14 @@ sub preprocess (@) { #{{{
                        }
                        sort { $counts{$b} <=> $counts{$a} } keys %counts).
                        "\n</table>\n" ;
-       } else {
+       }
+       else {
                # In case of misspelling, default to a page cloud
 
                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).
@@ -63,6 +83,6 @@ sub preprocess (@) { #{{{
 
                return $res;
        }
-} # }}}
+}
 
 1