progress: switch to new pagespec_match_list

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

diff --git a/IkiWiki/Plugin/postsparkline.pm b/IkiWiki/Plugin/postsparkline.pm
index 6fc96f8b343cbca8eeeb893c41e2569a962d915c..1d4532366e4f2d12eac17f65e5cdf56bb6e7308b 100644 (file)
--- a/IkiWiki/Plugin/postsparkline.pm
+++ b/IkiWiki/Plugin/postsparkline.pm
@@ -3,14 +3,23 @@ package IkiWiki::Plugin::postsparkline;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        IkiWiki::loadplugin('sparkline');
        IkiWiki::loadplugin('sparkline');

+       hook(type => "getsetup", id => "postsparkline", call => \&getsetup);

        hook(type => "preprocess", id => "postsparkline", call => \&preprocess);
        hook(type => "preprocess", id => "postsparkline", call => \&preprocess);

-} # }}}
+}
+
+sub getsetup () {
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}

 
 

-sub preprocess (@) { #{{{
+sub preprocess (@) {

        my %params=@_;
 
        if (! exists $params{max}) {
        my %params=@_;
 
        if (! exists $params{max}) {


@@ -21,11 +30,16 @@ sub preprocess (@) { #{{{
                return "";
        }
 
                return "";
        }
 

+       my $deptype;

        if (! exists $params{time} || $params{time} ne 'mtime') {
                $params{timehash} = \%IkiWiki::pagectime;
        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;
        }
        else {
                $params{timehash} = \%IkiWiki::pagemtime;

+               # need to update when pages are changed
+               $deptype = deptype("content");

        }
 
        if (! exists $params{formula}) {
        }
 
        if (! exists $params{formula}) {


@@ -39,17 +53,11 @@ sub preprocess (@) { #{{{
                error 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,
+                       limit => sub { $_[0] ne $params{page} },
+               );

 
        my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
        if ($@) {
 
        my @data=eval qq{IkiWiki::Plugin::postsparkline::formula::$formula(\\\%params, \@list)};
        if ($@) {


@@ -69,7 +77,7 @@ sub preprocess (@) { #{{{
        delete $params{color};
        return IkiWiki::Plugin::sparkline::preprocess(%params, 
                map { $_.$color => "" } reverse @data);
        delete $params{color};
        return IkiWiki::Plugin::sparkline::preprocess(%params, 
                map { $_.$color => "" } reverse @data);

-} # }}}
+}

 
 sub perfoo ($@) {
        my $sub=shift;
 
 sub perfoo ($@) {
        my $sub=shift;