diff options
| author | bremner <bremner@web> | 2008-08-30 10:08:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2008-08-30 10:08:09 -0400 |
| commit | 57dd3268b7ffe9b0f537036d5886bf0d5faa25bb (patch) | |
| tree | a8bb7e861358f3d6a625b45fa9fb536b1e7ce358 | |
| parent | 75a096d056270d5b20f19a55416436d731654105 (diff) | |
| download | ikiwiki-57dd3268b7ffe9b0f537036d5886bf0d5faa25bb.tar ikiwiki-57dd3268b7ffe9b0f537036d5886bf0d5faa25bb.tar.gz | |
patch to add call to File::MimeInfo::Magic::default to filecheck plugin
| -rw-r--r-- | doc/plugins/filecheck/discussion.mdwn | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/doc/plugins/filecheck/discussion.mdwn b/doc/plugins/filecheck/discussion.mdwn index 1394d2f7b..54b14c183 100644 --- a/doc/plugins/filecheck/discussion.mdwn +++ b/doc/plugins/filecheck/discussion.mdwn @@ -8,3 +8,34 @@ Would you be receptive to a patch that e.g. called File::MimeInfo::Magic::defaul if ::magic() returns undef? --[[DavidBremner]] > Yes, that looks to be ok. --[[Joey]] + +>> OK, here is such a patch. One modification of previous behaviour is that +>> that if default returns undef, this is returned. As far as I understand +>> the code/doc for File::MimeInfo, under is used only as an error return +>> for ::default +<pre> +From 84f40d7fa822c6cc09506cca2dbf38a8b19f8bb7 Mon Sep 17 00:00:00 2001 +From: David Bremner <bremner@unb.ca> +Date: Fri, 29 Aug 2008 20:46:20 -0300 +Subject: [PATCH] call File::MimeInfo::default if ::magic() returns undef + +--- + IkiWiki/Plugin/filecheck.pm | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm +index 9c7a8db..a94c02b 100644 +--- a/IkiWiki/Plugin/filecheck.pm ++++ b/IkiWiki/Plugin/filecheck.pm +@@ -127,7 +127,7 @@ sub match_mimetype ($$;@) { #{{{ + } + my $mimetype=File::MimeInfo::Magic::magic($file); + if (! defined $mimetype) { +- $mimetype="unknown"; ++ $mimetype=File::MimeInfo::Magic::default($file); + } + + my $regexp=IkiWiki::glob2re($wanted); +-- +1.5.6.3 +</pre> |