Improve mimetype detection for object storages
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
parent
e873b1a3d1
commit
21b8399e88
|
@ -390,7 +390,15 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
|
|||
$stat['size'] = filesize($tmpFile);
|
||||
$stat['mtime'] = $mTime;
|
||||
$stat['storage_mtime'] = $mTime;
|
||||
$stat['mimetype'] = \OC::$server->getMimeTypeDetector()->detect($tmpFile);
|
||||
|
||||
// run path based detection first, to use file extension because $tmpFile is only a random string
|
||||
$mimetypeDetector = \OC::$server->getMimeTypeDetector();
|
||||
$mimetype = $mimetypeDetector->detectPath($path);
|
||||
if ($mimetype === 'application/octet-stream') {
|
||||
$mimetype = $mimetypeDetector->detect($tmpFile);
|
||||
}
|
||||
|
||||
$stat['mimetype'] = $mimetype;
|
||||
$stat['etag'] = $this->getETag($path);
|
||||
|
||||
$fileId = $this->getCache()->put($path, $stat);
|
||||
|
|
|
@ -173,6 +173,10 @@ class Detection implements IMimeTypeDetector {
|
|||
|
||||
// note: leading dot doesn't qualify as extension
|
||||
if (strpos($fileName, '.') > 0) {
|
||||
|
||||
// remove versioning extension: name.v1508946057 and transfer extension: name.ocTransferId2057600214.part
|
||||
$fileName = preg_replace('!((\.v\d+)|((.ocTransferId\d+)?.part))$!', '', $fileName);
|
||||
|
||||
//try to guess the type by the file extension
|
||||
$extension = strtolower(strrchr($fileName, '.'));
|
||||
$extension = substr($extension, 1); //remove leading .
|
||||
|
|
|
@ -83,6 +83,8 @@ class DetectionTest extends \Test\TestCase {
|
|||
$this->assertEquals('application/octet-stream', $this->detection->detectPath('..hidden'));
|
||||
$this->assertEquals('application/octet-stream', $this->detection->detectPath('foo'));
|
||||
$this->assertEquals('application/octet-stream', $this->detection->detectPath(''));
|
||||
$this->assertEquals('image/png', $this->detection->detectPath('foo.png.ocTransferId123456789.part'));
|
||||
$this->assertEquals('image/png', $this->detection->detectPath('foo.png.v1234567890'));
|
||||
}
|
||||
|
||||
public function testDetectString() {
|
||||
|
|
Loading…
Reference in New Issue