X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9a9b25346dbf380e955ffa815bbe6f6d4ac9c5a6..fb2e00014da40d677f79b6b07e05ae821e7e10e5:/IkiWiki/Plugin/progress.pm

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 2c015284e..d27df5ca8 100644
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -3,25 +3,26 @@ package IkiWiki::Plugin::progress;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "progress", call => \&getsetup);
 	hook(type => "preprocess", id => "progress", call => \&preprocess);
 	hook(type => "format",     id => "progress", call => \&format);
-} # }}}
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return 
 		plugin => {
 			safe => 1,
 			rebuild => undef,
+			section => "widget",
 		},
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 	
 	my $fill;
@@ -29,24 +30,19 @@ sub preprocess (@) { #{{{
 	if (defined $params{percent}) {
 		$fill = $params{percent};
 		($fill) = $fill =~ m/($percentage_pattern)/; # fill is untainted now
+		$fill=~s/%$//;
 		if (! defined $fill || ! length $fill || $fill > 100 || $fill < 0) {
 			error(sprintf(gettext("illegal percent value %s"), $params{percent}));
 		}
-		elsif ($fill !~ /%$/) {
-			$fill.="%";
-		}
+		$fill.="%";
 	}
 	elsif (defined $params{totalpages} and defined $params{donepages}) {
-		add_depends($params{page}, $params{totalpages});
-		add_depends($params{page}, $params{donepages});
-
-		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%";
@@ -65,9 +61,9 @@ sub preprocess (@) { #{{{
   <div class="progress-done" style="width: $fill">$fill</div>
 </div>
 EODIV
-} # }}}
+}
 
-sub format(@) { #{{{
+sub format(@) {
 	my %params = @_;
 
 	# If HTMLScrubber has removed the style attribute, then bring it back
@@ -75,6 +71,6 @@ sub format(@) { #{{{
 	$params{content} =~ s!<div class="progress-done">($percentage_pattern)</div>!<div class="progress-done" style="width: $1">$1</div>!g;
 
 	return $params{content};    
-} #}}}
+}
 
 1