Add mime definition for Windows Media Metafile (TIKA-2004).
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/d405172c Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/d405172c Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/d405172c Branch: refs/heads/TIKA-1508 Commit: d405172c89f0cc94135d09b30c3c6ea135d6a5b2 Parents: 4d308fd Author: tballison <[email protected]> Authored: Wed Jun 15 08:29:02 2016 -0400 Committer: tballison <[email protected]> Committed: Wed Jun 15 08:29:02 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../main/resources/org/apache/tika/mime/tika-mimetypes.xml | 8 +++++++- .../src/test/java/org/apache/tika/TikaDetectionTest.java | 2 +- .../src/test/java/org/apache/tika/mime/TestMimeTypes.java | 7 ++++++- .../test/resources/test-documents/testWindowsMediaMeta.asx | 6 ++++++ 5 files changed, 22 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/d405172c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 59d2451..d244bd4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,7 @@ 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/d405172c/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 ca84d94..210ce0c 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 @@ -6584,11 +6584,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/d405172c/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/d405172c/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java index 3f22842..5dda858 100644 --- a/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java +++ b/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java @@ -1037,7 +1037,12 @@ public class TestMimeTypes { 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/d405172c/tika-parsers/src/test/resources/test-documents/testWindowsMediaMeta.asx ---------------------------------------------------------------------- diff --git a/tika-parsers/src/test/resources/test-documents/testWindowsMediaMeta.asx b/tika-parsers/src/test/resources/test-documents/testWindowsMediaMeta.asx new file mode 100644 index 0000000..cca9ae5 --- /dev/null +++ b/tika-parsers/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
