Merge commit 'remotes/smcv/ready/remove-pagespec-merge'

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

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 2c20ca195dcd1f55ff4cdbe9ad70fed642c236af..5a2301af49232943d4f0889c0f3b9ba28f05396f 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -3,13 +3,22 @@ package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "pagecount", call => \&getsetup);
        hook(type => "preprocess", id => "pagecount", call => \&preprocess);
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
        
@@ -17,13 +26,14 @@ sub preprocess (@) { #{{{
        # register a dependency.
        add_depends($params{page}, $params{pages});
        
-       my @pages=keys %pagesources;
-       return $#pages+1 if $params{pages} eq "*"; # optimisation
-       my $count=0;
-       foreach my $page (@pages) {
-               $count++ if pagespec_match($page, $params{pages}, location => $params{page});
+       my @pages;
+       if ($params{pages} eq "*") {
+               @pages=keys %pagesources;
+       }
+       else {
+               @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
        }
-       return $count;
-} # }}}
+       return $#pages+1;
+}
 
 1