postsparkline and progress: also contentless dependencies

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 67149bc8bda67ba83a3225273236aceb0156607e..5e5dc739d2696cce58374c2717b453d104521f11 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1771,17 +1771,19 @@ sub add_depends ($$;@) {
        my $page=shift;
        my $pagespec=shift;
 
+       my $simple=$pagespec =~ /$config{wiki_file_regexp}/ &&
+               $pagespec !~ /[\s*?()!]/;
+
        my $deptype=$DEPEND_CONTENT | $DEPEND_EXISTS;
        if (@_) {
                my %params=@_;
-               if (defined $params{content} && $params{content} == 0) {
+               if (defined $params{content} && $params{content} == 0 &&
+                   ($simple || pagespec_contentless($pagespec))) {
                        $deptype=$deptype & ~$DEPEND_CONTENT;
                }
        }
 
-       if ($pagespec =~ /$config{wiki_file_regexp}/ &&
-               $pagespec !~ /[\s*?()!]/) {
-               # a simple dependency, which can be matched by string eq
+       if ($simple) {
                $depends_simple{$page}{lc $pagespec} |= $deptype;
                return 1;
        }
@@ -1974,6 +1976,18 @@ sub pagespec_valid ($) {
        return ! $@;
 }
 
+sub pagespec_contentless ($) {
+       my $spec=shift;
+
+       while ($spec=~m{
+               (\w+)\([^\)]*\) # only match pagespec functions
+       }igx) {
+               return 0 unless $1=~/^(glob|internal|creation_month|creation_day|creation_year|created_before|created_after)$/;
+       }
+
+       return 1;
+}
+
 sub glob2re ($) {
        my $re=quotemeta(shift);
        $re=~s/\\\*/.*/g;