Merge remote branch 'smcv/ready/glob-cache'

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

diff --git a/IkiWiki/Plugin/cutpaste.pm b/IkiWiki/Plugin/cutpaste.pm
index 1737775d5f5c8851c8d88e3204c73fc4e427c33c..0f6ea0b1f3798650219f7a08a66fa77f85151401 100644 (file)
--- a/IkiWiki/Plugin/cutpaste.pm
+++ b/IkiWiki/Plugin/cutpaste.pm
@@ -3,66 +3,88 @@ package IkiWiki::Plugin::cutpaste;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
-use UNIVERSAL;
+use IkiWiki 3.00;
 
-my %savedtext;
-
-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "cutpaste", call => \&getsetup);
+       hook(type => "needsbuild", id => "cutpaste", call => \&needsbuild);
        hook(type => "preprocess", id => "cut", call => \&preprocess_cut, scan => 1);
        hook(type => "preprocess", id => "copy", call => \&preprocess_copy, scan => 1);
        hook(type => "preprocess", id => "paste", call => \&preprocess_paste);
-} # }}}
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub needsbuild (@) {
+       my $needsbuild=shift;
+       foreach my $page (keys %pagestate) {
+               if (exists $pagestate{$page}{cutpaste}) {
+                       if (exists $pagesources{$page} &&
+                           grep { $_ eq $pagesources{$page} } @$needsbuild) {
+                               # remove state, will be re-added if
+                               # the cut/copy directive is still present
+                               # on rebuild.
+                               delete $pagestate{$page}{cutpaste};
+                       }
+               }
+       }
+       return $needsbuild;
+}
 
-sub preprocess_cut (@) { #{{{
+sub preprocess_cut (@) {
        my %params=@_;
 
        foreach my $param (qw{id text}) {
                if (! exists $params{$param}) {
-                       return "[[cut ".sprintf(gettext('%s parameter is required'), $param)."]]";
+                       error sprintf(gettext('%s parameter is required'), $param);
                }
        }
 
-       $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
-       $savedtext{$params{page}}->{$params{id}} = $params{text};
+       $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text};
 
        return "" if defined wantarray;
-} # }}}
+}
 
-sub preprocess_copy (@) { #{{{
+sub preprocess_copy (@) {
        my %params=@_;
 
        foreach my $param (qw{id text}) {
                if (! exists $params{$param}) {
-                       return "[[copy ".sprintf(gettext('%s parameter is required'), $param)."]]";
+                       error sprintf(gettext('%s parameter is required'), $param);
                }
        }
 
-       $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
-       $savedtext{$params{page}}->{$params{id}} = $params{text};
+       $pagestate{$params{page}}{cutpaste}{$params{id}} = $params{text};
 
-       return IkiWiki::preprocess($params{page}, $params{destpage}, 
-               IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray;
-} # }}}
+       return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text})
+               if defined wantarray;
+}
 
-sub preprocess_paste (@) { #{{{
+sub preprocess_paste (@) {
        my %params=@_;
 
        foreach my $param (qw{id}) {
                if (! exists $params{$param}) {
-                       return "[[paste ".sprintf(gettext('%s parameter is required'), $param)."]]";
+                       error sprintf(gettext('%s parameter is required'), $param);
                }
        }
 
-       if (! exists $savedtext{$params{page}}) {
-               return "[[paste ".gettext('no text was copied in this page')."]]";
+       if (! exists $pagestate{$params{page}}{cutpaste}) {
+               error gettext('no text was copied in this page');
        }
-       if (! exists $savedtext{$params{page}}->{$params{id}}) {
-               return "[[paste ".sprintf(gettext('no text was copied in this page with id %s'), $params{id})."]]";
+       if (! exists $pagestate{$params{page}}{cutpaste}{$params{id}}) {
+               error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
        }
 
-       return IkiWiki::preprocess($params{page}, $params{destpage}, 
-               IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}}));
-} # }}}
+       return IkiWiki::preprocess($params{page}, $params{destpage},
+               $pagestate{$params{page}}{cutpaste}{$params{id}});
+}
 
 1;