Repository: tika Updated Branches: refs/heads/2.x f90193aa0 -> ffaa4deaa
TIKA-2004 -- add mime definitions for Windows Media Metafile Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/ffaa4dea Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/ffaa4dea Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/ffaa4dea Branch: refs/heads/2.x Commit: ffaa4deaa6aa065ecebc258de07d6e61b9b1882c Parents: f90193a Author: tballison <[email protected]> Authored: Wed Jun 15 08:28:27 2016 -0400 Committer: tballison <[email protected]> Committed: Wed Jun 15 08:28:27 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../src/test/java/org/apache/tika/mime/TestMimeTypes.java | 7 ++++++- .../main/resources/org/apache/tika/mime/tika-mimetypes.xml | 8 +++++++- .../src/test/java/org/apache/tika/TikaDetectionTest.java | 2 +- .../test/resources/test-documents/testWindowsMediaMeta.asx | 6 ++++++ 5 files changed, 22 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/ffaa4dea/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 9a4acc2..1d8f2cc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,8 @@ Release 2.0 - Future Development Release 1.14 - ??? + * Add mime definition for Windows Media Metafile (TIKA-2004). + * Add mime definitions of iCal and vCalendar (TIKA-2006). * Upgrade to PDFBox 2.0.2 (TIKA-1996). http://git-wip-us.apache.org/repos/asf/tika/blob/ffaa4dea/tika-app/src/test/java/org/apache/tika/mime/TestMimeTypes.java ---------------------------------------------------------------------- diff --git a/tika-app/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-app/src/test/java/org/apache/tika/mime/TestMimeTypes.java index 56cc725..eed11e8 100644 --- a/tika-app/src/test/java/org/apache/tika/mime/TestMimeTypes.java +++ b/tika-app/src/test/java/org/apache/tika/mime/TestMimeTypes.java @@ -975,7 +975,12 @@ public class TestMimeTypes extends TikaTest { assertType("text/calendar", "testICalendar.ics"); assertType("text/x-vcalendar", "testVCalendar.vcs"); } - + + @Test + public void testASX() throws Exception { + assertType("application/x-ms-asx", "testWindowsMediaMeta.asx"); + } + private void assertText(byte[] prefix) throws IOException { assertMagic("text/plain", prefix); } http://git-wip-us.apache.org/repos/asf/tika/blob/ffaa4dea/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml ---------------------------------------------------------------------- diff --git a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml index 736078a..c513361 100644 --- a/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml +++ b/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml @@ -6410,11 +6410,17 @@ <mime-type type="video/x-ms-asf"> <glob pattern="*.asf"/> - <glob pattern="*.asx"/> <magic> <match value="0x3026b275" type="big32" offset="0" /> </magic> </mime-type> + <mime-type type="application/x-ms-asx"> + <_comment>Windows Media Metafile</_comment> + <glob pattern="*.asx"/> + <root-XML localName="asx"/> + <root-XML localName="ASX"/> + <sub-class-of type="application/xml"/> + </mime-type> <mime-type type="video/x-ms-wm"> <glob pattern="*.wm"/> </mime-type> http://git-wip-us.apache.org/repos/asf/tika/blob/ffaa4dea/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java ---------------------------------------------------------------------- diff --git a/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java b/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java index 799f977..45256fb 100644 --- a/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java +++ b/tika-core/src/test/java/org/apache/tika/TikaDetectionTest.java @@ -833,7 +833,7 @@ public class TikaDetectionTest { assertEquals("video/x-flv", tika.detect("x.flv")); assertEquals("video/x-m4v", tika.detect("x.m4v")); assertEquals("video/x-ms-asf", tika.detect("x.asf")); - assertEquals("video/x-ms-asf", tika.detect("x.asx")); + assertEquals("application/x-ms-asx", tika.detect("x.asx")); assertEquals("video/x-ms-wm", tika.detect("x.wm")); assertEquals("video/x-ms-wmv", tika.detect("x.wmv")); assertEquals("video/x-ms-wmx", tika.detect("x.wmx")); http://git-wip-us.apache.org/repos/asf/tika/blob/ffaa4dea/tika-test-resources/src/test/resources/test-documents/testWindowsMediaMeta.asx ---------------------------------------------------------------------- diff --git a/tika-test-resources/src/test/resources/test-documents/testWindowsMediaMeta.asx b/tika-test-resources/src/test/resources/test-documents/testWindowsMediaMeta.asx new file mode 100644 index 0000000..cca9ae5 --- /dev/null +++ b/tika-test-resources/src/test/resources/test-documents/testWindowsMediaMeta.asx @@ -0,0 +1,6 @@ +<asx version = "3.0"> + <entry> + <title>Council Video for 4/7/2009</title> + <ref href = "mms://media1.fresno.gov/CouncilVideoArchive/20090407.wmv"/> + </entry> +</asx> \ No newline at end of file
