Author: nick
Date: Mon Aug 5 11:55:22 2013
New Revision: 1510439
URL: http://svn.apache.org/r1510439
Log:
TIKA-1156 AMR glob, subtypes, magic and unit test
Added:
tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR.amr
(with props)
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1510439&r1=1510438&r2=1510439&view=diff
==============================================================================
---
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
(original)
+++
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
Mon Aug 5 11:55:22 2013
@@ -3425,9 +3425,20 @@
<mime-type type="audio/adpcm">
<glob pattern="*.adp"/>
</mime-type>
- <mime-type type="audio/amr"/>
- <mime-type type="audio/amr-wb"/>
- <mime-type type="audio/amr-wb+"/>
+
+ <mime-type type="audio/amr">
+ <glob pattern="*.amr"/>
+ <magic priority="60">
+ <match value="#!AMR" type="string" offset="0"/>
+ </magic>
+ </mime-type>
+ <mime-type type="audio/amr-wb">
+ <sub-class-of type="audio/amr"/>
+ </mime-type>
+ <mime-type type="audio/amr-wb+">
+ <sub-class-of type="audio/amr"/>
+ </mime-type>
+
<mime-type type="audio/asc"/>
<mime-type type="audio/basic">
Modified:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=1510439&r1=1510438&r2=1510439&view=diff
==============================================================================
---
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
(original)
+++
tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
Mon Aug 5 11:55:22 2013
@@ -629,6 +629,10 @@ public class TestMimeTypes extends TestC
assertTypeByData("application/zip","testKMZ.kmz");
}
+ public void testAMR() throws IOException {
+ assertTypeDetection("testAMR.amr", "audio/amr");
+ }
+
public void testEmlx() throws IOException {
assertTypeDetection("testEMLX.emlx", "message/x-emlx");
}
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR.amr
URL:
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR.amr?rev=1510439&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR.amr
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
