You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ni...@apache.org on 2013/08/05 18:04:35 UTC
svn commit: r1510582 - in /tika/trunk:
tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
tika-parsers/src/test/resources/test-documents/testAMR-WB.amr
Author: nick
Date: Mon Aug 5 16:04:35 2013
New Revision: 1510582
URL: http://svn.apache.org/r1510582
Log:
TIKA-1156 AMR-WB mime magic and unit test
Added:
tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR-WB.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=1510582&r1=1510581&r2=1510582&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 16:04:35 2013
@@ -3428,15 +3428,22 @@
<mime-type type="audio/amr">
<glob pattern="*.amr"/>
- <magic priority="60">
+ <magic priority="40">
+ <!-- Specific match for the original AMR format -->
+ <match value="#!AMR\n" type="string" offset="0"/>
+ <!-- General match for AMR subtypes we don't have entries for -->
<match value="#!AMR" type="string" offset="0"/>
</magic>
</mime-type>
<mime-type type="audio/amr-wb">
<sub-class-of type="audio/amr"/>
+ <magic priority="50">
+ <match value="#!AMR-WB\n" type="string" offset="0"/>
+ </magic>
</mime-type>
<mime-type type="audio/amr-wb+">
<sub-class-of type="audio/amr"/>
+ <!-- TIKA-1156 sample needed - might be "#!AMR-WB+\n" ? -->
</mime-type>
<mime-type type="audio/asc"/>
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=1510582&r1=1510581&r2=1510582&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 16:04:35 2013
@@ -630,7 +630,14 @@ public class TestMimeTypes extends TestC
}
public void testAMR() throws IOException {
+ // AMR matches on name, data or both
assertTypeDetection("testAMR.amr", "audio/amr");
+
+ // AMR-WB subtype shares extension, so needs data to identify
+ assertTypeDetection("testAMR-WB.amr", "audio/amr", "audio/amr-wb", "audio/amr-wb");
+
+ // Ditto for the AMR-WB+ subtype, which we don't have a sample file of yet
+ //assertTypeDetection("testAMR-WB+.amr", "audio/amr", "audio/amr-wb+", "audio/amr-wb+");
}
public void testEmlx() throws IOException {
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR-WB.amr
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR-WB.amr?rev=1510582&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tika/trunk/tika-parsers/src/test/resources/test-documents/testAMR-WB.amr
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream