Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/filecheck.pm b/IkiWiki/Plugin/filecheck.pm
index 6f71be3015489712d57a88a3eaaf9bbef3609403..27f764e3b344a344ef2d491552824c2c40e6e5f1 100644 (file)
--- a/IkiWiki/Plugin/filecheck.pm
+++ b/IkiWiki/Plugin/filecheck.pm
@@ -53,6 +53,7 @@ sub parsesize ($) { #{{{
        return $base;
 } #}}}
 
        return $base;
 } #}}}
 

+# This is provided for other plugins that want to convert back the other way.

 sub humansize ($) { #{{{
        my $size=shift;
 
 sub humansize ($) { #{{{
        my $size=shift;
 


@@ -68,7 +69,7 @@ package IkiWiki::PageSpec;
 
 sub match_maxsize ($$;@) { #{{{
        my $page=shift;
 
 sub match_maxsize ($$;@) { #{{{
        my $page=shift;

-       my $maxsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
+       my $maxsize=eval{IkiWiki::Plugin::filecheck::parsesize(shift)};

        if ($@) {
                return IkiWiki::FailReason->new("unable to parse maxsize (or number too large)");
        }
        if ($@) {
                return IkiWiki::FailReason->new("unable to parse maxsize (or number too large)");
        }


@@ -89,7 +90,7 @@ sub match_maxsize ($$;@) { #{{{
 
 sub match_minsize ($$;@) { #{{{
        my $page=shift;
 
 sub match_minsize ($$;@) { #{{{
        my $page=shift;

-       my $minsize=eval{IkiWiki::Plugin::attachment::parsesize(shift)};
+       my $minsize=eval{IkiWiki::Plugin::filecheck::parsesize(shift)};

        if ($@) {
                return IkiWiki::FailReason->new("unable to parse minsize (or number too large)");
        }
        if ($@) {
                return IkiWiki::FailReason->new("unable to parse minsize (or number too large)");
        }


@@ -126,7 +127,10 @@ sub match_mimetype ($$;@) { #{{{
        }
        my $mimetype=File::MimeInfo::Magic::magic($file);
        if (! defined $mimetype) {
        }
        my $mimetype=File::MimeInfo::Magic::magic($file);
        if (! defined $mimetype) {

-               $mimetype="unknown";
+               $mimetype=File::MimeInfo::Magic::default($file);
+               if (! defined $mimetype) {
+                       $mimetype="unknown";
+               }

        }
 
        my $regexp=IkiWiki::glob2re($wanted);
        }
 
        my $regexp=IkiWiki::glob2re($wanted);