progress: switch to new pagespec_match_list

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 6da3e4f7150c3bb94bf01107bc91d847c6587ef8..fe64b40b1da13fe9b21936e2f5098c7bcc225c79 100644 (file)
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -36,16 +36,12 @@ sub preprocess (@) {
                $fill.="%";
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {
                $fill.="%";
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {

-               add_depends($params{page}, $params{totalpages}, deptype("presence"));
-               add_depends($params{page}, $params{donepages}, deptype("presence"));
-
-               my @pages=keys %pagesources;
-               my $totalcount=0;
-               my $donecount=0;
-               foreach my $page (@pages) {
-                       $totalcount++ if pagespec_match($page, $params{totalpages}, location => $params{page});
-                       $donecount++ if pagespec_match($page, $params{donepages}, location => $params{page});
-               }
+               my $totalcount=pagespec_match_list(
+                       $params{page}, $params{totalpages},
+                       deptype => deptype("presence"));
+               my $donecount=pagespec_match_list(
+                       $params{page}, $params{donepages},
+                       deptype => deptype("presence"));

                
                if ($totalcount == 0) {
                        $fill = "100%";
                
                if ($totalcount == 0) {
                        $fill = "100%";