Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changelog
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
haiku.pm
diff --git
a/IkiWiki/Plugin/haiku.pm
b/IkiWiki/Plugin/haiku.pm
index 0e93e9d8d2bccb553fb509cddaa9d11733284506..bf23dce673f4b93a264545a4ab4c4156ef869eef 100644
(file)
--- a/
IkiWiki/Plugin/haiku.pm
+++ b/
IkiWiki/Plugin/haiku.pm
@@
-4,19
+4,28
@@
package IkiWiki::Plugin::haiku;
use warnings;
use strict;
use warnings;
use strict;
-use IkiWiki;
+use IkiWiki
3.00
;
-sub import {
#{{{
- IkiWiki::hook(type => "preprocess", id => "haiku",
-
call => \&preprocess);
-}
# }}}
+sub import {
+ hook(type => "getsetup", id => "haiku", call => \&getsetup);
+
hook(type => "preprocess", id => "haiku",
call => \&preprocess);
+}
-sub preprocess (@) { #{{{
+sub getsetup {
+ return
+ plugin => {
+ safe => 1,
+ rebuild => undef,
+ section => "widget",
+ },
+}
+
+sub preprocess (@) {
my %params=@_;
my $haiku;
eval q{use Coy};
my %params=@_;
my $haiku;
eval q{use Coy};
- if ($@) {
+ if ($@
|| ! Coy->can("Coy::with_haiku")
) {
my @canned=(
"The lack of a Coy:
No darting, subtle haiku.
my @canned=(
"The lack of a Coy:
No darting, subtle haiku.
@@
-35,20
+44,17
@@
sub preprocess (@) { #{{{
$haiku=$canned[rand @canned];
}
else {
$haiku=$canned[rand @canned];
}
else {
- # Coy is rather strange, so the best way to get a haiku
- # out of it is to die..
- eval {die exists $params{hint} ? $params{hint} : $params{page}};
- $haiku=$@;
-
+ $haiku=Coy::with_haiku($params{hint} ? $params{hint} : $params{page});
+
# trim off other text
$haiku=~s/\s+-----\n//s;
$haiku=~s/\s+-----.*//s;
}
$haiku=~s/^\s+//mg;
# trim off other text
$haiku=~s/\s+-----\n//s;
$haiku=~s/\s+-----.*//s;
}
$haiku=~s/^\s+//mg;
- $haiku=~s/\n/<br>\n/mg;
+ $haiku=~s/\n/<br
\/
>\n/mg;
- return
$haiku
-}
# }}}
+ return
"\n\n<blockquote><p>$haiku</p></blockquote>\n\n";
+}
1
1