X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a44bfb158dac9e04647a75bc819a73bc18f5acce..61f4dbb8bec4c39a4c48aa67493e34205a3f3b06:/IkiWiki/Plugin/pagecount.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 8a1376e09..dd5de3c83 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -1,31 +1,40 @@
 #!/usr/bin/perl
-# Provides [[pagecount ]] to count the number of pages.
 package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "pagecount", 
-		call => \&preprocess);
-} # }}}
+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,
+			section => "widget",
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
-	$params{pages}="*" unless defined $params{pages};
-	
-	# Needs to update count whenever a page is added or removed, so
-	# register a dependency.
-	IkiWiki::add_depends($params{page}, $params{pages});
+	my $pages=defined $params{pages} ? $params{pages} : "*";
 	
-	my @pages=keys %IkiWiki::pagesources;
-	return $#pages+1 if $params{pages} eq "*"; # optimisation
-	my $count=0;
-	foreach my $page (@pages) {
-		$count++ if IkiWiki::globlist_match($page, $params{pages});
+	# Just get a list of all the pages, and count the items in it.
+	# Use a presence dependency to only update when pages are added
+	# or removed.
+
+	if ($pages eq '*') {
+		# optimisation to avoid needing to try matching every page
+		add_depends($params{page}, $pages, deptype("presence"));
+		return scalar keys %pagesources;
 	}
-	return $count;
-} # }}}
+
+	return scalar pagespec_match_list($params{page}, $pages,
+		deptype => deptype("presence"));
+}
 
 1