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

avoid internal error message when img uses just-deleted page 

I think this used to be a fatal error, not just inline error, so I don't
know why it was never noticed, but if a page that an img directive mentions
gets deleted, bestlink() returns a file that no longer exists, and
srcfile() throws an error.

Note that bestlink's behavior of returning a deleted file could be
considered buggy. But, if it's changed to not do that, the page with the img
on it is not updated at all when the file is removed.
master
Joey Hess 2008-07-21 16:38:40 -04:00
parent d9af10a1be
commit d724a26754
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki/Plugin/img.pm
View File

@ -41,6 +41,10 @@ sub preprocess (@) { #{{{
} }
my $file = bestlink($params{page}, $image); my $file = bestlink($params{page}, $image);
my $srcfile = srcfile($file, 1);
if (! defined $srcfile) {
error(sprintf(gettext("%s not found"), $image));
}
my $dir = $params{page}; my $dir = $params{page};
my $base = IkiWiki::basename($file); my $base = IkiWiki::basename($file);
@ -61,12 +65,12 @@ sub preprocess (@) { #{{{
will_render($params{page}, $imglink); will_render($params{page}, $imglink);
if (-e $outfile && (-M srcfile($file) >= -M $outfile)) { if (-e $outfile && (-M $srcfile >= -M $outfile)) {
$r = $im->Read($outfile); $r = $im->Read($outfile);
error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r; error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r;
} }
else { else {
$r = $im->Read(srcfile($file)); $r = $im->Read($srcfile);
error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
$r = $im->Resize(geometry => "${w}x${h}"); $r = $im->Resize(geometry => "${w}x${h}");
@ -83,7 +87,7 @@ sub preprocess (@) { #{{{
} }
} }
else { else {
$r = $im->Read(srcfile($file)); $r = $im->Read($srcfile);
error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r; error sprintf(gettext("failed to read %s: %s"), $file, $r) if $r;
$imglink = $file; $imglink = $file;
} }