[MMBASE SCM] r40993 - mmbase/trunk/core/src/main/java/org/mmbase/util/magicfile

[michiel]

Author: michiel
Date: 2010-02-15 14:16:31 +0100 (Mon, 15 Feb 2010)
New Revision: 40993

Modified:
   mmbase/trunk/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java
Log:
try using the extensionof the file if the mimetype could not be determined with 
its conents

Modified: 
mmbase/trunk/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java    
2010-02-15 13:15:46 UTC (rev 40992)
+++ mmbase/trunk/core/src/main/java/org/mmbase/util/magicfile/MagicFile.java    
2010-02-15 13:16:31 UTC (rev 40993)
@@ -81,7 +81,15 @@
         FileInputStream fir = null;
         try {
             fir = new FileInputStream(file);
-            return getMimeType(fir);
+            String result =  getMimeType(fir);
+            if (result == FAILED) {
+                String fileName = file.getName();
+                int i = fileName.lastIndexOf(".");
+                if (i > 0) {
+                    result = extensionToMimeType(fileName.substring(i + 1));
+                }
+            }
+            return result;
         } finally {
             if (fir != null) {
                 fir.close();

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs