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

diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index dc996ae32..2fae9c5fe 100644
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -3,14 +3,24 @@ package IkiWiki::Plugin::postsparkline;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
 	IkiWiki::loadplugin('sparkline');
+	hook(type => "getsetup", id => "postsparkline", call => \&getsetup);
 	hook(type => "preprocess", id => "postsparkline", call => \&preprocess);
-} # }}}
+}
+
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+			section => "widget",
+		},
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
 	my %params=@_;
 
 	if (! exists $params{max}) {
@@ -21,44 +31,43 @@ sub preprocess (@) { #{{{
 		return "";
 	}
 
+	my $deptype;
 	if (! exists $params{time} || $params{time} ne 'mtime') {
 		$params{timehash} = \%IkiWiki::pagectime;
+		# need to update when pages are added or removed
+		$deptype = deptype("presence");
 	}
 	else {
 		$params{timehash} = \%IkiWiki::pagemtime;
+		# need to update when pages are changed
+		$deptype = deptype("content");
 	}
 
 	if (! exists $params{formula}) {
-		return "[[postsparkline ".gettext("missing formula")."]]";
+		error gettext("missing formula")
 	}
 	my $formula=$params{formula};
 	$formula=~s/[^a-zA-Z0-9]*//g;
 	$formula=IkiWiki::possibly_foolish_untaint($formula);
 	if (! length $formula ||
 	    ! IkiWiki::Plugin::postsparkline::formula->can($formula)) {
-		return "[[postsparkline ".gettext("unknown formula")."]]";
+		error gettext("unknown formula");
 	}
 
-	add_depends($params{page}, $params{pages});
-
-	my @list;
-	foreach my $page (keys %pagesources) {
-		next if $page eq $params{page};
-		if (pagespec_match($page, $params{pages}, location => $params{page})) {
-			push @list, $page;
-		}
-	}
-	
-	@list = sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } @list;
+	my @list=sort { $params{timehash}->{$b} <=> $params{timehash}->{$a} } 
+		pagespec_match_list($params{page}, $params{pages},
+			deptype => $deptype,
+			filter => sub { $_[0] eq $params{page} },
+		);
 
 	my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
 	if ($@) {
-		return "[[postsparkline error $@]]";
+		error $@;
 	}
 
 	if (! @data) {
 		# generate an empty graph
-		push @data, 0 foreach 1..$params{max};
+		push @data, 0 foreach 1..($params{max} / 2);
 	}
 
 	my $color=exists $params{color} ? "($params{color})" : "";
@@ -69,7 +78,7 @@ sub preprocess (@) { #{{{
 	delete $params{color};
 	return IkiWiki::Plugin::sparkline::preprocess(%params, 
 		map { $_.$color => "" } reverse @data);
-} # }}}
+}
 
 sub perfoo ($@) {
 	my $sub=shift;