Magic number and bug fixed

src/main/java/com/j256/simplemagic/ContentInfoUtil.java

@@ -15,6 +15,7 @@
 import java.util.zip.GZIPInputStream;
 
 import com.j256.simplemagic.entries.MagicEntries;
+import java.net.URL;
 
 /**
  * <p>
@@ -186,6 +187,30 @@ public ContentInfoUtil(Reader reader, ErrorCallBack errorCallBack) throws IOExce
 		this.errorCallBack = errorCallBack;
 		this.magicEntries = readEntries(reader);
 	}
+
+	/**
+	 * Return the content type for the URL or null if none of the magic entries matched. You might want to use
+	 * the {@link ContentInfoInputStreamWrapper} class to delegate to an input-stream and determine content information
+	 * at the same time.
+	 * 
+	 * @throws IOException
+	 *             If there was a problem reading from the input-stream.
+	 * @see ContentInfoInputStreamWrapper
+	 */        
+        public ContentInfo findMatch(final URL url) throws IOException  {
+                InputStream is = null;
+                try {
+                        is = url.openStream();
+                        ContentInfo contentInfo = findMatch(is);
+                        return contentInfo;
+                } catch (IOException ex) {
+                        throw new IOException(ex);
+                } finally {
+                        if(is != null) {
+                                is.close();                
+                        }
+                }
+        }
 
 	/**
 	 * Return the content type for the file-path or null if none of the magic entries matched.
@@ -205,6 +230,9 @@ public ContentInfo findMatch(String filePath) throws IOException {
 	 */
 	public ContentInfo findMatch(File file) throws IOException {
 		int readSize = fileReadSize;
+                if(!file.canRead()) {
+                    throw new IOException("Unable to read "+ file.getName());
+                }              
 		if (file.length() < readSize) {
 			readSize = (int) file.length();
 		}

src/main/java/com/j256/simplemagic/ContentType.java

@@ -179,6 +179,8 @@ public enum ContentType {
 	VCARD("text/x-vcard", "vcard", "vcf"),
 	/** Mpeg video */
 	VIDEO_MPEG("video/mpeg", "mpeg", "mpeg", "mpg", "mpe", "m1v", "m2v"),
+        /** VOTable data exchange format */
+        VOTABLE("application/x-votable+xml", "votable", "vot", "xml"),        
 	/** VRML modeling file */
 	VRML("model/vrml", "vrml", "wrl", "vrml"),
 	/** WAV audio */
@@ -974,5 +976,5 @@ public List<String> getReferences() {
          */
         public List<String> getReferenceUrls() {
             return ianaDB.getIanaMetadata(this.getMimeType()).getReferenceURL();
-        }        
+        }   
 }

src/main/java/com/j256/simplemagic/entries/IanaEntries.java

@@ -9,8 +9,6 @@
 import java.io.Reader;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
 
 /**
@@ -23,7 +21,7 @@
  * </ul>
  * In addition to these elements, two URLs are created in order to locate the
  * description of the mime type and the URL of the articles.
- * @author Jean-Christophe Malapert ([email protected])
+ * @author Jean-Christophe Malapert
  */
 public class IanaEntries {
 

src/main/java/com/j256/simplemagic/entries/IanaEntry.java

@@ -8,7 +8,7 @@
 
 /**
  * <a href="https://www.iana.org/assignments/media-types/media-types.xhtml">IANA metadata</a> coming from
- * @author Jean-Christophe Malapert ([email protected])
+ * @author Jean-Christophe Malapert
  */
 public class IanaEntry {
 

src/test/java/com/j256/simplemagic/ContentInfoUtilTest.java

@@ -20,6 +20,7 @@
 import java.io.OutputStream;
 import java.io.Reader;
 import java.io.StringReader;
+import java.net.URL;
 import java.util.Arrays;
 
 import org.easymock.EasyMock;
@@ -206,8 +207,15 @@ public void testMultipleMagicFiles() throws Exception {
 		checkFile(util, new FileType("/files/x.gif", ContentType.GIF, "gif", "image/gif",
 				"GIF image data, version 89a, 32 x 32", false));
 		checkFile(util, new FileType("/files/jfif.jpg", ContentType.JPEG, "jpeg", "image/jpeg",
-				"JPEG image data, JFIF standard 1.01", false));
-	}
+				"JPEG image data, JFIF standard 1.01", false));                
+	}                        
+
+        @Test
+        public void testNetCDFMagicFile() throws IOException {
+            ContentInfoUtil util = new ContentInfoUtil();
+            ContentInfo info = util.findMatch(new URL("https://www.unidata.ucar.edu/software/netcdf/examples/WMI_Lear.nc"));
+            assertEquals("Mime-type of netCDF", "application/x-netcdf", info.getMimeType());
+        }         
 
 	@Test
 	public void testPerformanceRun() throws Exception {
@@ -229,6 +237,12 @@ public void testEmptyMimeType() {
 		ContentInfoUtil util = getContentInfoUtil();
 		assertEquals(ContentType.EMPTY, util.findMatch(new byte[0]).getContentType());
 	}
+
+	@Test(expected = IOException.class)
+	public void testUnableToReadFile() throws IOException {
+		ContentInfoUtil util = getContentInfoUtil();
+                util.findMatch(new File("/ttttttt/fileNotExist"));
+	}        
 
 	@Test
 	public void testFileRead() throws IOException {

src/test/java/com/j256/simplemagic/ContentTypeTest.java

@@ -1,5 +1,7 @@
 package com.j256.simplemagic;
 
+import java.io.IOException;
+import java.net.URL;
 import static org.junit.Assert.assertEquals;
 
 import java.util.HashMap;
@@ -41,5 +43,5 @@ public void testPrintDuplicates() {
 	public void testFileExtensions() {
 		assertEquals(ContentType.GIF, ContentType.fromFileExtension("gif"));
 		assertEquals(ContentType.OTHER, ContentType.fromFileExtension("xyzzy"));
-	}
+	}       
 }

src/test/resources/magic

@@ -1,5 +1,18 @@
-0       string          SIMPLE\x20\x20= FITS data
-!:mime  application/fits
+0	string		SIMPLE\x20\x20=	FITS data
+!:mime	application/fits
+
+0       string          \<?xml\ version="
+>15     string          >\0
+>>23    search/400      \<VOTABLE	VOTABLE data exchange format
+!:mime  application/x-votable+xml
+
+0       string          \<?xml\ version="
+>15     string          >\0
+>>23    search/400      \<xs:schema     XSD schema
+
+0       string          OggS		Ogg, an open source media container format
+!:mime  application/ogg
+
 
 0	lelong		0xc3cbc6c5	RISC OS Chunk data
 >12	string		OBJ_		\b, AOF object
@@ -5733,6 +5746,7 @@
 0	lelong	20000630		OpenEXR image data
 
 0	string	CDF\001			NetCDF Data Format data
+!:mime application/x-netcdf
 
 0	belong	0x0e031301	Hierarchical Data Format (version 4) data
 !:mime	application/x-hdf
@@ -10329,7 +10343,7 @@
 >10	byte&0x0B	2		- ADPCM3 encoding
 >10	byte&0x0B	3		- ADPCM4 encoding
 >10	byte&0x0B	8		- New ADPCM3 encoding
->10	byte&0x04	4		with resync
+>10	byte&0x04       4		with resync
 
 # EBML id:
 0		belong		0x1a45dfa3
@@ -10340,3 +10354,6 @@
 !:mime  video/webm
 >>&1	string		matroska			Matroska data
 !:mime  video/x-matroska
+
+
+