* by looking at the file extension. Typically, this method would be called on the
* result of guessMimeType().
*
- * Currently, this method does the following:
- *
- * If $mime is "unknown/unknown" and isRecognizableExtension( $ext ) returns false,
- * return the result of guessTypesForExtension($ext).
- *
- * If $mime is "application/x-opc+zip" and isMatchingExtension( $ext, $mime )
- * gives true, return the result of guessTypesForExtension($ext).
- *
* @param string $mime The mime type, typically guessed from a file's content.
* @param string $ext The file extension, as taken from the file name
*
".$ext is not a known OPC extension.\n" );
$mime = 'application/zip';
}
+ } elseif ( $mime === 'text/plain' && $this->findMediaType( ".$ext" ) === MEDIATYPE_TEXT ) {
+ // Textual types are sometimes not recognized properly.
+ // If detected as text/plain, and has an extension which is textual
+ // improve to the extension's type. For example, csv and json are often
+ // misdetected as text/plain.
+ $mime = $this->guessTypesForExtension( $ext );
}
if ( isset( $this->mMimeTypeAliases[$mime] ) ) {
--- /dev/null
+<?php
+class MimeMagicTest extends MediaWikiTestCase {
+
+ /** @var MimeMagic */
+ private $mimeMagic;
+
+ function setUp() {
+ $this->mimeMagic = MimeMagic::singleton();
+ parent::setUp();
+ }
+
+ /**
+ * @dataProvider providerImproveTypeFromExtension
+ * @param $ext String File extension (no leading dot)
+ * @param $oldMime String Initially detected mime
+ * @param $expectedMime String Mime type after taking extension into account
+ */
+ function testImproveTypeFromExtension( $ext, $oldMime, $expectedMime ) {
+ $actualMime = $this->mimeMagic->improveTypeFromExtension( $oldMime, $ext );
+ $this->assertEquals( $expectedMime, $actualMime );
+ }
+
+ function providerImproveTypeFromExtension() {
+ return array(
+ array( 'gif', 'image/gif', 'image/gif' ),
+ array( 'gif', 'unknown/unknown', 'unknown/unknown' ),
+ array( 'wrl', 'unknown/unknown', 'model/vrml' ),
+ array( 'txt', 'text/plain', 'text/plain' ),
+ array( 'csv', 'text/plain', 'text/csv' ),
+ array( 'tsv', 'text/plain', 'text/tab-separated-values' ),
+ array( 'json', 'text/plain', 'application/json' ),
+ array( 'foo', 'application/x-opc+zip', 'application/zip' ),
+ array( 'docx', 'application/x-opc+zip', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' ),
+ array( 'djvu', 'image/x-djvu', 'image/vnd.djvu' ),
+ array( 'wav', 'audio/wav', 'audio/wav' ),
+ );
+ }
+
+}