Fix escaping of filenames in historyurl. (Thanks, aj)

[git.ikiwiki.info.git] / IkiWiki / Plugin / filecheck.pm

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 1549b82db75a9d5164c04b166a3d6d149bdb01dc..3b0a7b3148d4edc2bb5bf1c8d11af474dc28a1c7 100644 (file)
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -39,6 +39,19 @@ my %units=(          # size in bytes
        #   -- Joey
 );
 
        #   -- Joey
 );
 

+sub import {
+       hook(type => "getsetup", id => "filecheck",  call => \&getsetup);
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "misc",
+               },
+}
+

 sub parsesize ($) {
        my $size=shift;
 
 sub parsesize ($) {
        my $size=shift;
 


@@ -119,15 +132,29 @@ sub match_mimetype ($$;@) {
                return IkiWiki::ErrorReason->new("file does not exist");
        }
 
                return IkiWiki::ErrorReason->new("file does not exist");
        }
 

-       # Use ::magic to get the mime type, the idea is to only trust
-       # data obtained by examining the actual file contents.
+       # Get the mime type.
+       #
+       # First, try File::Mimeinfo. This is fast, but doesn't recognise
+       # all files.

        eval q{use File::MimeInfo::Magic};
        eval q{use File::MimeInfo::Magic};

-       if ($@) {
-               return IkiWiki::ErrorReason->new("failed to load File::MimeInfo::Magic ($@); cannot check MIME type");
+       my $mimeinfo_ok=! $@;
+       my $mimetype;
+       if ($mimeinfo_ok) {
+               my $mimetype=File::MimeInfo::Magic::magic($file);

        }
        }

-       my $mimetype=File::MimeInfo::Magic::magic($file);
+
+       # Fall back to using file, which has a more complete
+       # magic database.

        if (! defined $mimetype) {
        if (! defined $mimetype) {

-               $mimetype=File::MimeInfo::Magic::default($file);
+               open(my $file_h, "-|", "file", "-bi", $file);
+               $mimetype=<$file_h>;
+               chomp $mimetype;
+               close $file_h;
+       }
+       if (! defined $mimetype || $mimetype !~s /;.*//) {
+               # Fall back to default value.
+               $mimetype=File::MimeInfo::Magic::default($file)
+                       if $mimeinfo_ok;

                if (! defined $mimetype) {
                        $mimetype="unknown";
                }
                if (! defined $mimetype) {
                        $mimetype="unknown";
                }