urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add a missing -n to tla undo call. 

* otl2hmtl can't be safely used with IPC::Open2 since it sometimes
  writes before consuming its whole stdin. Avoid this deadlock.
* Fix alt tags for outline checkboxes.
master
joey 2006-09-08 20:33:49 +00:00
parent 757b627414
commit 0e224e9f9c
2 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
IkiWiki/Plugin/otl.pm
View File

@ -5,7 +5,6 @@ package IkiWiki::Plugin::otl;
use warnings; use warnings;
use strict; use strict;
use IkiWiki; use IkiWiki;
use IPC::Open2;
sub import { #{{{ sub import { #{{{
IkiWiki::hook(type => "filter", id => "otl", call => \&filter); IkiWiki::hook(type => "filter", id => "otl", call => \&filter);
@ -18,9 +17,9 @@ sub filter (@) { #{{{
# Munge up check boxes to look a little bit better. This is a hack. # Munge up check boxes to look a little bit better. This is a hack.
my $checked=IkiWiki::htmllink($params{page}, $params{page}, my $checked=IkiWiki::htmllink($params{page}, $params{page},
"smileys/star_on.png", 0); "smileys/star_on.png", 0, 0, "[X]");
my $unchecked=IkiWiki::htmllink($params{page}, $params{page}, my $unchecked=IkiWiki::htmllink($params{page}, $params{page},
"smileys/star_off.png", 0); "smileys/star_off.png", 0, 0, "[_]");
$params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg; $params{content}=~s/^(\s*)\[X\]\s/${1}$checked /mg;
$params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg; $params{content}=~s/^(\s*)\[_\]\s/${1}$unchecked /mg;
@ -30,29 +29,56 @@ sub filter (@) { #{{{
sub htmlize (@) { #{{{ sub htmlize (@) { #{{{
my %params=@_; my %params=@_;
# Can't use open2 since otl2html doesn't play nice with buffering.
# Instead, fork off a child process that will run otl2html and feed
# it the content. Then read otl2html's response.
my $tries=10; my $tries=10;
my $pid; my $pid;
while (1) { do {
eval { $pid = open(KID_TO_READ, "-|");
$pid=open2(*IN, *OUT, 'otl2html -S /dev/null -T /dev/stdin'); unless (defined $pid) {
};
last unless $@;
$tries--; $tries--;
if ($tries < 1) { if ($tries < 1) {
IkiWiki::debug("failed to run otl2html: $@"); IkiWiki::debug("failed to fork: $@");
return $params{content}; return $params{content};
} }
} }
# open2 doesn't respect "use open ':utf8'" } until defined $pid;
binmode (IN, ':utf8');
binmode (OUT, ':utf8');
print OUT $params{content}; if (! $pid) {
close OUT; $tries=10;
$pid=undef;
do {
$pid = open(KID_TO_WRITE, "|-");
unless (defined $pid) {
$tries--;
if ($tries < 1) {
IkiWiki::debug("failed to fork: $@");
print $params{content};
exit;
}
}
} until defined $pid;
if (! $pid) {
if (! exec 'otl2html', '-S', '/dev/null', '-T', '/dev/stdin') {
IkiWiki::debug("failed to run otl2html: $@");
print $params{content};
exit;
}
}
print KID_TO_WRITE $params{content};
close KID_TO_WRITE;
waitpid $pid, 0;
exit;
}
local $/ = undef; local $/ = undef;
my $ret=<IN>; my $ret=<KID_TO_READ>;
close IN; close KID_TO_READ;
waitpid $pid, 0; waitpid $pid, 0;
$ret=~s/.*<body>//s; $ret=~s/.*<body>//s;

7
debian/changelog vendored
View File

@ -1,8 +1,11 @@
ikiwiki (1.26) UNRELEASED; urgency=low ikiwiki (1.26) unstable; urgency=low
* Add a missing -n to tla undo call. * Add a missing -n to tla undo call.
* otl2hmtl can't be safely used with IPC::Open2 since it sometimes
writes before consuming its whole stdin. Avoid this deadlock.
* Fix alt tags for outline checkboxes.
-- Joey Hess <joeyh@debian.org> Fri, 8 Sep 2006 15:10:13 -0400 -- Joey Hess <joeyh@debian.org> Fri, 8 Sep 2006 16:24:16 -0400
ikiwiki (1.25) unstable; urgency=low ikiwiki (1.25) unstable; urgency=low