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

Make enclosures absolute (in feeds they have to be).

master
Amitai Schlair 2013-02-20 19:14:20 -05:00
parent 770dc95a6b
commit 3d2be49420
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/meta.pm
View File

@ -128,7 +128,7 @@ sub preprocess (@) {
}
add_depends($page, $link, deptype("presence"));
$value=urlto($link, $page);
$value=urlto($link, $page, 1);
$pagestate{$page}{meta}{enclosure}=$value;
# fallthrough
}
@ -330,7 +330,7 @@ sub pagetemplate (@) {
}
if (exists $pagestate{$page}{meta}{enclosure}) {
$template->param(enclosure => $pagestate{$page}{meta}{enclosure});
$template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));
}
foreach my $field (qw{authorurl}) {

31
t/podcast.t
View File

@ -9,7 +9,7 @@ BEGIN {
"XML::Feed and/or HTML::Parser not available"};
}
else {
eval q{use Test::More tests => 89};
eval q{use Test::More tests => 92};
}
}
@ -110,8 +110,8 @@ sub single_page_html {
like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
q{html enclosure});
my ($href) = _extract_html_links($html, 'piano');
ok(-f $href,
q{html enclosure exists});
is($href, '/piano.mp3',
q{html enclosure sans -url is site-absolute});
$html = "$tmp/out/attempted_multiple_enclosures/index.html";
like(_extract_html_content($html, 'content'), qr/has content and/m,
@ -119,8 +119,21 @@ sub single_page_html {
like(_extract_html_content($html, 'enclosure'), qr/this episode/m,
q{html enclosure});
($href) = _extract_html_links($html, 'walter');
ok(-f $href,
q{html enclosure exists});
is($href, '/walter.ogg',
q{html enclosure sans -url is site-absolute});
my $baseurl = 'http://example.com';
ok(! system(@command, "-url=$baseurl", q{--rebuild}));
$html = "$tmp/out/pianopost/index.html";
($href) = _extract_html_links($html, 'piano');
is($href, "$baseurl/piano.mp3",
q{html enclosure with -url is fully absolute});
$html = "$tmp/out/attempted_multiple_enclosures/index.html";
($href) = _extract_html_links($html, 'walter');
is($href, "$baseurl/walter.ogg",
q{html enclosure with -url is fully absolute});
ok(! system("rm -rf $tmp $statedir"), q{teardown});
}
@ -146,11 +159,11 @@ sub inlined_pages_html {
like($enclosures, qr/this episode/m,
q{html enclosure});
my ($href) = _extract_html_links($html, 'piano.mp3');
ok(-f $href,
q{html enclosure from pianopost exists});
is($href, '/piano.mp3',
q{html enclosure from pianopost sans -url});
($href) = _extract_html_links($html, 'walter.ogg');
ok(-f $href,
q{html enclosure from attempted_multiple_enclosures exists});
is($href, '/walter.ogg',
q{html enclosure from attempted_multiple_enclosures sans -url});
ok(! system("rm -rf $tmp $statedir"), q{teardown});
}