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 2015/08/20 23:06:47 UTC
svn commit: r1696855 - in /tika/trunk:
tika-core/src/main/resources/org/apache/tika/mime/
tika-parsers/src/main/java/org/apache/tika/parser/pkg/
tika-parsers/src/test/java/org/apache/tika/parser/pkg/
tika-parsers/src/test/resources/test-documents/
Author: nick
Date: Thu Aug 20 21:06:46 2015
New Revision: 1696855
URL: http://svn.apache.org/r1696855
Log:
TIKA-1718 Add more Commons Compress supported formats
Added:
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
tika/trunk/tika-parsers/src/test/resources/test-documents/test-documents.tar.Z (with props)
Modified:
tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.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=1696855&r1=1696854&r2=1696855&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 Thu Aug 20 21:06:46 2015
@@ -3716,6 +3716,14 @@
<glob pattern="*.xap"/>
</mime-type>
+ <mime-type type="application/x-snappy-framed">
+ <_comment>Snappy Framed</_comment>
+ <magic priority="50">
+ <match value="sNaPpY" type="string" offset="0"/>
+ </magic>
+ <glob pattern="*.sz"/>
+ </mime-type>
+
<mime-type type="application/x-sqlite3">
<magic priority="50">
<match value="SQLite format 3\x00" type="string" offset="0"/>
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java?rev=1696855&r1=1696854&r2=1696855&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/pkg/CompressorParser.java Thu Aug 20 21:06:46 2015
@@ -31,7 +31,10 @@ import org.apache.commons.compress.compr
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
import org.apache.commons.compress.compressors.gzip.GzipUtils;
import org.apache.commons.compress.compressors.pack200.Pack200CompressorInputStream;
+import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream;
+import org.apache.commons.compress.compressors.snappy.SnappyCompressorInputStream;
import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+import org.apache.commons.compress.compressors.z.ZCompressorInputStream;
import org.apache.commons.io.input.CloseShieldInputStream;
import org.apache.tika.exception.TikaException;
import org.apache.tika.extractor.EmbeddedDocumentExtractor;
@@ -56,19 +59,18 @@ public class CompressorParser extends Ab
private static final MediaType BZIP2 = MediaType.application("x-bzip2");
private static final MediaType GZIP = MediaType.application("gzip");
private static final MediaType GZIP_ALT = MediaType.application("x-gzip");
+ private static final MediaType COMPRESS = MediaType.application("x-compress");
private static final MediaType XZ = MediaType.application("x-xz");
- private static final MediaType PACK = MediaType.application("application/x-java-pack200");
+ private static final MediaType PACK = MediaType.application("x-java-pack200");
+ private static final MediaType SNAPPY = MediaType.application("x-snappy-framed");
private static final MediaType ZLIB = MediaType.application("zlib");
private static final Set<MediaType> SUPPORTED_TYPES =
- MediaType.set(BZIP, BZIP2, GZIP, GZIP_ALT, XZ, PACK, ZLIB);
+ MediaType.set(BZIP, BZIP2, GZIP, GZIP_ALT, COMPRESS, XZ, PACK, ZLIB);
static MediaType getMediaType(CompressorInputStream stream) {
// TODO Add support for the remaining CompressorInputStream formats:
- // FramedSnappyCompressorInputStream
// LZMACompressorInputStream
- // SnappyCompressorInputStream
- // ZCompressorInputStream
if (stream instanceof BZip2CompressorInputStream) {
return BZIP2;
} else if (stream instanceof GzipCompressorInputStream) {
@@ -77,8 +79,14 @@ public class CompressorParser extends Ab
return XZ;
} else if (stream instanceof DeflateCompressorInputStream) {
return ZLIB;
+ } else if (stream instanceof ZCompressorInputStream) {
+ return COMPRESS;
} else if (stream instanceof Pack200CompressorInputStream) {
return PACK;
+ } else if (stream instanceof FramedSnappyCompressorInputStream ||
+ stream instanceof SnappyCompressorInputStream) {
+ // TODO Add unit tests for this format
+ return SNAPPY;
} else {
return MediaType.OCTET_STREAM;
}
Added: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java?rev=1696855&view=auto
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java (added)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/pkg/CompressParserTest.java Thu Aug 20 21:06:46 2015
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tika.parser.pkg;
+
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static org.junit.Assert.assertEquals;
+
+import java.io.InputStream;
+
+import org.apache.tika.metadata.Metadata;
+import org.apache.tika.parser.AutoDetectParser;
+import org.apache.tika.parser.Parser;
+import org.apache.tika.sax.BodyContentHandler;
+import org.junit.Test;
+import org.xml.sax.ContentHandler;
+
+/**
+ * Test case for parsing compress (.Z) files.
+ */
+public class CompressParserTest extends AbstractPkgTest {
+ @Test
+ public void testCompressParsing() throws Exception {
+ Parser parser = new AutoDetectParser(); // Should auto-detect!
+ ContentHandler handler = new BodyContentHandler();
+ Metadata metadata = new Metadata();
+
+ InputStream stream = TarParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tar.Z");
+ try {
+ parser.parse(stream, handler, metadata, recursingContext);
+ } finally {
+ stream.close();
+ }
+
+ assertEquals("application/x-compress", metadata.get(Metadata.CONTENT_TYPE));
+ String content = handler.toString();
+ assertContains("test-documents/testEXCEL.xls", content);
+ assertContains("Sample Excel Worksheet", content);
+ assertContains("test-documents/testHTML.html", content);
+ assertContains("Test Indexation Html", content);
+ assertContains("test-documents/testOpenOffice2.odt", content);
+ assertContains("This is a sample Open Office document", content);
+ assertContains("test-documents/testPDF.pdf", content);
+ assertContains("Apache Tika", content);
+ assertContains("test-documents/testPPT.ppt", content);
+ assertContains("Sample Powerpoint Slide", content);
+ assertContains("test-documents/testRTF.rtf", content);
+ assertContains("indexation Word", content);
+ assertContains("test-documents/testTXT.txt", content);
+ assertContains("Test d'indexation de Txt", content);
+ assertContains("test-documents/testWORD.doc", content);
+ assertContains("This is a sample Microsoft Word Document", content);
+ assertContains("test-documents/testXML.xml", content);
+ assertContains("Rida Benjelloun", content);
+ }
+
+ /**
+ * Tests that the ParseContext parser is correctly
+ * fired for all the embedded entries.
+ */
+ @Test
+ public void testEmbedded() throws Exception {
+ Parser parser = new AutoDetectParser(); // Should auto-detect!
+ ContentHandler handler = new BodyContentHandler();
+ Metadata metadata = new Metadata();
+
+ InputStream stream = ZipParserTest.class.getResourceAsStream(
+ "/test-documents/test-documents.tar.Z");
+ try {
+ parser.parse(stream, handler, metadata, trackingContext);
+ } finally {
+ stream.close();
+ }
+
+ // Should find a single entry, for the (compressed) tar file
+ assertEquals(1, tracker.filenames.size());
+ assertEquals(1, tracker.mediatypes.size());
+ assertEquals(1, tracker.modifiedAts.size());
+
+ assertEquals(null, tracker.filenames.get(0));
+ assertEquals(null, tracker.mediatypes.get(0));
+ assertEquals(null, tracker.modifiedAts.get(0));
+
+ // Tar file starts with the directory name
+ assertEquals("test-documents/", new String(tracker.lastSeenStart, 0, 15, US_ASCII));
+ }
+}
\ No newline at end of file
Added: tika/trunk/tika-parsers/src/test/resources/test-documents/test-documents.tar.Z
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/test-documents.tar.Z?rev=1696855&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tika/trunk/tika-parsers/src/test/resources/test-documents/test-documents.tar.Z
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream