You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ju...@apache.org on 2010/08/18 10:41:08 UTC
svn commit: r986594 - in /tika/trunk/tika-core/src:
main/java/org/apache/tika/detect/ main/java/org/apache/tika/mime/
test/java/org/apache/tika/detect/ test/java/org/apache/tika/mime/
Author: jukka
Date: Wed Aug 18 08:41:08 2010
New Revision: 986594
URL: http://svn.apache.org/viewvc?rev=986594&view=rev
Log:
TIKA-483: Empty file detected as text/plain
Modified:
tika/trunk/tika-core/src/main/java/org/apache/tika/detect/TextDetector.java
tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
tika/trunk/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java
tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/detect/TextDetector.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/detect/TextDetector.java?rev=986594&r1=986593&r2=986594&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/detect/TextDetector.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/detect/TextDetector.java Wed Aug 18 08:41:08 2010
@@ -96,7 +96,12 @@ public class TextDetector implements Det
for (int i = 0; i < NUMBER_OF_BYTES_TO_TEST; i++) {
int ch = input.read();
if (ch == -1) {
- return MediaType.TEXT_PLAIN;
+ if (i > 0) {
+ return MediaType.TEXT_PLAIN;
+ } else {
+ // See https://issues.apache.org/jira/browse/TIKA-483
+ return MediaType.OCTET_STREAM;
+ }
} else if (ch < IS_CONTROL_BYTE.length && IS_CONTROL_BYTE[ch]) {
return MediaType.OCTET_STREAM;
}
Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java?rev=986594&r1=986593&r2=986594&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/mime/MimeTypes.java Wed Aug 18 08:41:08 2010
@@ -214,6 +214,9 @@ public final class MimeTypes implements
public MimeType getMimeType(byte[] data) {
if (data == null) {
throw new IllegalArgumentException("Data is missing");
+ } else if (data.length == 0) {
+ // See https://issues.apache.org/jira/browse/TIKA-483
+ return rootMimeType;
}
// Then, check for magic bytes
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java?rev=986594&r1=986593&r2=986594&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/detect/TextDetectorTest.java Wed Aug 18 08:41:08 2010
@@ -39,9 +39,16 @@ public class TextDetectorTest extends Te
detector.detect(null, new Metadata()));
}
- public void testDetectText() throws Exception {
- assertText(new byte[0]);
+ /**
+ * Test for type detection of empty documents.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/TIKA-483">TIKA-483</a>
+ */
+ public void testDetectEmpty() throws Exception {
+ assertNotText(new byte[0]);
+ }
+ public void testDetectText() throws Exception {
assertText("Hello, World!".getBytes("UTF-8"));
assertText(" \t\r\n".getBytes("UTF-8"));
assertText(new byte[] { -1, -2, -3, 0x09, 0x0A, 0x0C, 0x0D, 0x1B });
Modified: tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java?rev=986594&r1=986593&r2=986594&view=diff
==============================================================================
--- tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java (original)
+++ tika/trunk/tika-core/src/test/java/org/apache/tika/mime/MimeDetectionTest.java Wed Aug 18 08:41:08 2010
@@ -138,7 +138,28 @@ public class MimeDetectionTest extends T
in.close();
}
}
-
+
+ /**
+ * Test for type detection of empty documents.
+ *
+ * @see <a href="https://issues.apache.org/jira/browse/TIKA-483">TIKA-483</a>
+ */
+ public void testEmptyDocument() throws IOException {
+ assertEquals(MediaType.OCTET_STREAM, mimeTypes.detect(
+ new ByteArrayInputStream(new byte[0]), new Metadata()));
+
+ Metadata namehint = new Metadata();
+ namehint.set(Metadata.RESOURCE_NAME_KEY, "test.txt");
+ assertEquals(MediaType.TEXT_PLAIN, mimeTypes.detect(
+ new ByteArrayInputStream(new byte[0]), namehint));
+
+ Metadata typehint = new Metadata();
+ typehint.set(Metadata.CONTENT_TYPE, "text/plain");
+ assertEquals(MediaType.TEXT_PLAIN, mimeTypes.detect(
+ new ByteArrayInputStream(new byte[0]), typehint));
+
+ }
+
/**
* Tests that when we repeatedly test the detection of a document
* that can be detected with Mime Magic, that we consistently