style changes
Reindented, moved a TODO from page to code, trimmed some unnecessary comments, and simplified the use of mkstemp.master
parent
a7a1d00e1c
commit
78a7f6938f
|
@ -1,36 +1,12 @@
|
||||||
#!/usr/bin/perl
|
#!/usr/bin/perl
|
||||||
# hnb markup
|
# hnb markup
|
||||||
package IkiWiki::Plugin::hnb;
|
# Licensed under the GPL v2 or greater
|
||||||
|
|
||||||
# Copyright (C) 2008 by Axel Beckert <abe@deuxchevaux.org>
|
# Copyright (C) 2008 by Axel Beckert <abe@deuxchevaux.org>
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or
|
# TODO: Make a switch to allow both HTML export routines of hnb
|
||||||
# modify it under the terms of the GNU General Public License
|
# (`export_html` and `export_htmlcss`) to be used.
|
||||||
# as published by the Free Software Foundation; either version 2
|
|
||||||
# of the License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
#
|
|
||||||
# You can reach the author by snail-mail at the following address:
|
|
||||||
#
|
|
||||||
# Axel Beckert
|
|
||||||
# Kuerbergstrasse 20
|
|
||||||
# 8049 Zurich, Switzerland
|
|
||||||
#
|
|
||||||
# Version History:
|
|
||||||
#
|
|
||||||
# 2008-03-10 / 0.01: Initial release
|
|
||||||
# 2008-05-08 / 0.01.1: License, version and version history added
|
|
||||||
# 2008-05-26 / 0.02: Using content instead of page, s/mktemp/File::Temp/
|
|
||||||
|
|
||||||
my $VERSION ='0.02';
|
package IkiWiki::Plugin::hnb;
|
||||||
|
|
||||||
use warnings;
|
use warnings;
|
||||||
use strict;
|
use strict;
|
||||||
|
@ -38,37 +14,35 @@ use IkiWiki 2.00;
|
||||||
use File::Temp qw(:mktemp);
|
use File::Temp qw(:mktemp);
|
||||||
|
|
||||||
sub import {
|
sub import {
|
||||||
hook(type => "htmlize", id => "hnb", call => \&htmlize);
|
hook(type => "htmlize", id => "hnb", call => \&htmlize);
|
||||||
}
|
}
|
||||||
|
|
||||||
sub htmlize (@) {
|
sub htmlize (@) {
|
||||||
my %params = @_;
|
my %params = @_;
|
||||||
|
|
||||||
# hnb does output version number etc. every time to STDOUT, so
|
# hnb outputs version number etc. every time to STDOUT, so
|
||||||
# using files makes it easier to seprarate.
|
# using files makes it easier to seprarate.
|
||||||
|
|
||||||
my ($fhi, $tmpin) = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX" );
|
my $tmpin = mkstemp( "/tmp/ikiwiki-hnbin.XXXXXXXXXX" );
|
||||||
my ($fho, $tmpout) = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" );
|
my $tmpout = mkstemp( "/tmp/ikiwiki-hnbout.XXXXXXXXXX" );
|
||||||
|
|
||||||
open(TMP, '>', $tmpin) or die "Can't write to $tmpin: $!";
|
open(TMP, '>', $tmpin) or die "Can't write to $tmpin: $!";
|
||||||
print TMP $params{content};
|
print TMP $params{content};
|
||||||
close TMP;
|
close TMP;
|
||||||
|
|
||||||
system("hnb '$tmpin' 'go root' 'export_html $tmpout' > /dev/null");
|
system("hnb '$tmpin' 'go root' 'export_html $tmpout' > /dev/null");
|
||||||
# Nicer, but too much output
|
unlink $tmpin;
|
||||||
#system('hnb', $tmpin, 'go root', "export_html $tmpout");
|
|
||||||
unlink $tmpin;
|
|
||||||
|
|
||||||
open(TMP, '<', $tmpout) or die "Can't read from $tmpout: $!";
|
open(TMP, '<', $tmpout) or die "Can't read from $tmpout: $!";
|
||||||
local $/;
|
local $/;
|
||||||
my $ret = <TMP>;
|
my $ret = <TMP>;
|
||||||
close TMP;
|
close TMP;
|
||||||
unlink $tmpout;
|
unlink $tmpout;
|
||||||
|
|
||||||
$ret =~ s/.*<body>//si;
|
$ret =~ s/.*<body>//si;
|
||||||
$ret =~ s/<body>.*//si;
|
$ret =~ s/<body>.*//si;
|
||||||
|
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
1;
|
1;
|
||||||
|
|
Loading…
Reference in New Issue