Commit 21bc8e0c authored by Morris Jobke's avatar Morris Jobke
Browse files

Merge pull request #15088 from oparoz/3d-support

Introducing 3D images support (media type)
parents a79d9730 f3fe4668
...@@ -81,6 +81,7 @@ return array( ...@@ -81,6 +81,7 @@ return array(
'impress' => array('text/impress', null), 'impress' => array('text/impress', null),
'jpeg' => array('image/jpeg', null), 'jpeg' => array('image/jpeg', null),
'jpg' => array('image/jpeg', null), 'jpg' => array('image/jpeg', null),
'jps' => array('image/jpeg', null),
'js' => array('application/javascript', 'text/plain'), 'js' => array('application/javascript', 'text/plain'),
'json' => array('application/json', 'text/plain'), 'json' => array('application/json', 'text/plain'),
'k25' => array('image/x-dcraw', null), 'k25' => array('image/x-dcraw', null),
...@@ -103,6 +104,7 @@ return array( ...@@ -103,6 +104,7 @@ return array(
'mp4' => array('video/mp4', null), 'mp4' => array('video/mp4', null),
'mpeg' => array('video/mpeg', null), 'mpeg' => array('video/mpeg', null),
'mpg' => array('video/mpeg', null), 'mpg' => array('video/mpeg', null),
'mpo' => array('image/jpeg', null),
'msi' => array('application/x-msi', null), 'msi' => array('application/x-msi', null),
'nef' => array('image/x-dcraw', null), 'nef' => array('image/x-dcraw', null),
'numbers' => array('application/x-iwork-numbers-sffnumbers', null), 'numbers' => array('application/x-iwork-numbers-sffnumbers', null),
......
...@@ -17,7 +17,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -17,7 +17,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
public function getName() { public function getName() {
return 'Repair mime types'; return 'Repair mime types';
} }
private static function existsStmt() { private static function existsStmt() {
return \OC_DB::prepare(' return \OC_DB::prepare('
SELECT count(`mimetype`) SELECT count(`mimetype`)
...@@ -51,14 +51,14 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -51,14 +51,14 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
) WHERE `mimetype` = ? ) WHERE `mimetype` = ?
'); ');
} }
private static function deleteStmt() { private static function deleteStmt() {
return \OC_DB::prepare(' return \OC_DB::prepare('
DELETE FROM `*PREFIX*mimetypes` DELETE FROM `*PREFIX*mimetypes`
WHERE `id` = ? WHERE `id` = ?
'); ');
} }
private static function updateByNameStmt() { private static function updateByNameStmt() {
return \OC_DB::prepare(' return \OC_DB::prepare('
UPDATE `*PREFIX*filecache` UPDATE `*PREFIX*filecache`
...@@ -69,7 +69,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -69,7 +69,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
) WHERE `name` ILIKE ? ) WHERE `name` ILIKE ?
'); ');
} }
private function repairMimetypes($wrongMimetypes) { private function repairMimetypes($wrongMimetypes) {
foreach ($wrongMimetypes as $wrong => $correct) { foreach ($wrongMimetypes as $wrong => $correct) {
// do we need to remove a wrong mimetype? // do we need to remove a wrong mimetype?
...@@ -81,8 +81,8 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -81,8 +81,8 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
$result = \OC_DB::executeAudited(self::existsStmt(), array($correct)); $result = \OC_DB::executeAudited(self::existsStmt(), array($correct));
$exists = $result->fetchOne(); $exists = $result->fetchOne();
if ( ! is_null($correct) ) { if (!is_null($correct)) {
if ( ! $exists ) { if (!$exists) {
// insert mimetype // insert mimetype
\OC_DB::executeAudited(self::insertStmt(), array($correct)); \OC_DB::executeAudited(self::insertStmt(), array($correct));
} }
...@@ -90,27 +90,27 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -90,27 +90,27 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
// change wrong mimetype to correct mimetype in filecache // change wrong mimetype to correct mimetype in filecache
\OC_DB::executeAudited(self::updateWrongStmt(), array($correct, $wrongId)); \OC_DB::executeAudited(self::updateWrongStmt(), array($correct, $wrongId));
} }
// delete wrong mimetype // delete wrong mimetype
\OC_DB::executeAudited(self::deleteStmt(), array($wrongId)); \OC_DB::executeAudited(self::deleteStmt(), array($wrongId));
} }
} }
} }
private function updateMimetypes($updatedMimetypes) { private function updateMimetypes($updatedMimetypes) {
foreach ($updatedMimetypes as $extension => $mimetype ) { foreach ($updatedMimetypes as $extension => $mimetype) {
$result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype)); $result = \OC_DB::executeAudited(self::existsStmt(), array($mimetype));
$exists = $result->fetchOne(); $exists = $result->fetchOne();
if ( ! $exists ) { if (!$exists) {
// insert mimetype // insert mimetype
\OC_DB::executeAudited(self::insertStmt(), array($mimetype)); \OC_DB::executeAudited(self::insertStmt(), array($mimetype));
} }
// change mimetype for files with x extension // change mimetype for files with x extension
\OC_DB::executeAudited(self::updateByNameStmt(), array($mimetype, '%.'.$extension)); \OC_DB::executeAudited(self::updateByNameStmt(), array($mimetype, '%.' . $extension));
} }
} }
...@@ -132,9 +132,9 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -132,9 +132,9 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
// separate doc from docx etc // separate doc from docx etc
self::updateMimetypes($updatedMimetypes); self::updateMimetypes($updatedMimetypes);
} }
private function fixApkMimeType() { private function fixApkMimeType() {
$updatedMimetypes = array( $updatedMimetypes = array(
'apk' => 'application/vnd.android.package-archive', 'apk' => 'application/vnd.android.package-archive',
...@@ -142,7 +142,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -142,7 +142,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
self::updateMimetypes($updatedMimetypes); self::updateMimetypes($updatedMimetypes);
} }
private function fixFontsMimeTypes() { private function fixFontsMimeTypes() {
// update wrong mimetypes // update wrong mimetypes
$wrongMimetypes = array( $wrongMimetypes = array(
...@@ -152,7 +152,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -152,7 +152,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
); );
self::repairMimetypes($wrongMimetypes); self::repairMimetypes($wrongMimetypes);
$updatedMimetypes = array( $updatedMimetypes = array(
'ttf' => 'application/font-sfnt', 'ttf' => 'application/font-sfnt',
'otf' => 'application/font-sfnt', 'otf' => 'application/font-sfnt',
...@@ -161,7 +161,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -161,7 +161,7 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
self::updateMimetypes($updatedMimetypes); self::updateMimetypes($updatedMimetypes);
} }
private function fixPostscriptMimeType() { private function fixPostscriptMimeType() {
$updatedMimetypes = array( $updatedMimetypes = array(
'eps' => 'application/postscript', 'eps' => 'application/postscript',
...@@ -195,6 +195,15 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -195,6 +195,15 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
self::updateMimetypes($updatedMimetypes); self::updateMimetypes($updatedMimetypes);
} }
private function introduce3dImagesMimeType() {
$updatedMimetypes = array(
'jps' => 'image/jpeg',
'mpo' => 'image/jpeg',
);
self::updateMimetypes($updatedMimetypes);
}
/** /**
* Fix mime types * Fix mime types
*/ */
...@@ -202,15 +211,15 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -202,15 +211,15 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
if ($this->fixOfficeMimeTypes()) { if ($this->fixOfficeMimeTypes()) {
$this->emit('\OC\Repair', 'info', array('Fixed office mime types')); $this->emit('\OC\Repair', 'info', array('Fixed office mime types'));
} }
if ($this->fixApkMimeType()) { if ($this->fixApkMimeType()) {
$this->emit('\OC\Repair', 'info', array('Fixed APK mime type')); $this->emit('\OC\Repair', 'info', array('Fixed APK mime type'));
} }
if ($this->fixFontsMimeTypes()) { if ($this->fixFontsMimeTypes()) {
$this->emit('\OC\Repair', 'info', array('Fixed fonts mime types')); $this->emit('\OC\Repair', 'info', array('Fixed fonts mime types'));
} }
if ($this->fixPostscriptMimeType()) { if ($this->fixPostscriptMimeType()) {
$this->emit('\OC\Repair', 'info', array('Fixed Postscript mime types')); $this->emit('\OC\Repair', 'info', array('Fixed Postscript mime types'));
} }
...@@ -218,5 +227,9 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep { ...@@ -218,5 +227,9 @@ class RepairMimeTypes extends BasicEmitter implements \OC\RepairStep {
if ($this->introduceRawMimeType()) { if ($this->introduceRawMimeType()) {
$this->emit('\OC\Repair', 'info', array('Fixed Raw mime types')); $this->emit('\OC\Repair', 'info', array('Fixed Raw mime types'));
} }
if ($this->introduce3dImagesMimeType()) {
$this->emit('\OC\Repair', 'info', array('Fixed 3D images mime types'));
}
} }
} }
...@@ -21,7 +21,7 @@ class TestRepairMimeTypes extends \Test\TestCase { ...@@ -21,7 +21,7 @@ class TestRepairMimeTypes extends \Test\TestCase {
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
$this->storage = new \OC\Files\Storage\Temporary(array()); $this->storage = new \OC\Files\Storage\Temporary([]);
$this->repair = new \OC\Repair\RepairMimeTypes(); $this->repair = new \OC\Repair\RepairMimeTypes();
} }
...@@ -29,7 +29,7 @@ class TestRepairMimeTypes extends \Test\TestCase { ...@@ -29,7 +29,7 @@ class TestRepairMimeTypes extends \Test\TestCase {
protected function tearDown() { protected function tearDown() {
$this->storage->getCache()->clear(); $this->storage->getCache()->clear();
$sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?'; $sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
\OC_DB::executeAudited($sql, array($this->storage->getId())); \OC_DB::executeAudited($sql, [$this->storage->getId()]);
$this->clearMimeTypes(); $this->clearMimeTypes();
DummyFileCache::clearCachedMimeTypes(); DummyFileCache::clearCachedMimeTypes();
...@@ -48,11 +48,11 @@ class TestRepairMimeTypes extends \Test\TestCase { ...@@ -48,11 +48,11 @@ class TestRepairMimeTypes extends \Test\TestCase {
foreach ($entries as $entry) { foreach ($entries as $entry) {
$this->storage->getCache()->put( $this->storage->getCache()->put(
$entry[0], $entry[0],
array( [
'size' => 0, 'size' => 0,
'mtime' => 0, 'mtime' => 0,
'mimetype' => $entry[1] 'mimetype' => $entry[1]
) ]
); );
} }
...@@ -71,7 +71,7 @@ class TestRepairMimeTypes extends \Test\TestCase { ...@@ -71,7 +71,7 @@ class TestRepairMimeTypes extends \Test\TestCase {
*/ */
private function getMimeTypeIdFromDB($mimeType) { private function getMimeTypeIdFromDB($mimeType) {
$sql = 'SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?'; $sql = 'SELECT `id` FROM `*PREFIX*mimetypes` WHERE `mimetype` = ?';
$results = \OC_DB::executeAudited($sql, array($mimeType)); $results = \OC_DB::executeAudited($sql, [$mimeType]);
$result = $results->fetchOne(); $result = $results->fetchOne();
if ($result) { if ($result) {
return $result['id']; return $result['id'];
...@@ -79,20 +79,8 @@ class TestRepairMimeTypes extends \Test\TestCase { ...@@ -79,20 +79,8 @@ class TestRepairMimeTypes extends \Test\TestCase {
return null; return null;
} }
/** private function renameMimeTypes($currentMimeTypes, $fixedMimeTypes) {
* Test renaming and splitting old office mime types $this->addEntries($currentMimeTypes);
*/
public function testRenameOfficeMimeTypes() {
$this->addEntries(
array(
array('test.doc', 'application/msword'),
array('test.docx', 'application/msword'),
array('test.xls', 'application/msexcel'),
array('test.xlsx', 'application/msexcel'),
array('test.ppt', 'application/mspowerpoint'),
array('test.pptx', 'application/mspowerpoint'),
)
);
$this->repair->run(); $this->repair->run();
...@@ -100,152 +88,150 @@ class TestRepairMimeTypes extends \Test\TestCase { ...@@ -100,152 +88,150 @@ class TestRepairMimeTypes extends \Test\TestCase {
DummyFileCache::clearCachedMimeTypes(); DummyFileCache::clearCachedMimeTypes();
$this->storage->getCache()->loadMimeTypes(); $this->storage->getCache()->loadMimeTypes();
$this->checkEntries( $this->checkEntries($fixedMimeTypes);
array(
array('test.doc', 'application/msword'),
array('test.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'),
array('test.xls', 'application/vnd.ms-excel'),
array('test.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'),
array('test.ppt', 'application/vnd.ms-powerpoint'),
array('test.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'),
)
);
} }
/**
* Test renaming and splitting old office mime types
*/
public function testRenameOfficeMimeTypes() {
$currentMimeTypes = [
['test.doc', 'application/msword'],
['test.docx', 'application/msword'],
['test.xls', 'application/msexcel'],
['test.xlsx', 'application/msexcel'],
['test.ppt', 'application/mspowerpoint'],
['test.pptx', 'application/mspowerpoint'],
];
$fixedMimeTypes = [
['test.doc', 'application/msword'],
['test.docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
['test.xls', 'application/vnd.ms-excel'],
['test.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
['test.ppt', 'application/vnd.ms-powerpoint'],
['test.pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'],
];
$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
}
/** /**
* Test renaming old fonts mime types * Test renaming old fonts mime types
*/ */
public function testRenameFontsMimeTypes() { public function testRenameFontsMimeTypes() {
$this->addEntries( $currentMimeTypes = [
array( ['test.ttf', 'application/x-font-ttf'],
array('test.ttf', 'application/x-font-ttf'), ['test.otf', 'font/opentype'],
array('test.otf', 'font/opentype'), ['test.pfb', 'application/octet-stream'],
array('test.pfb', 'application/octet-stream'), ];
)
); $fixedMimeTypes = [
['test.ttf', 'application/font-sfnt'],
$this->repair->run(); ['test.otf', 'application/font-sfnt'],
['test.pfb', 'application/x-font'],
// force mimetype reload ];
DummyFileCache::clearCachedMimeTypes();
$this->storage->getCache()->loadMimeTypes(); $this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
$this->checkEntries(
array(
array('test.ttf', 'application/font-sfnt'),
array('test.otf', 'application/font-sfnt'),
array('test.pfb', 'application/x-font'),
)
);
} }
/** /**
* Test renaming the APK mime type * Test renaming the APK mime type
*/ */
public function testRenameAPKMimeType() { public function testRenameAPKMimeType() {
$this->addEntries( $currentMimeTypes = [
array( ['test.apk', 'application/octet-stream'],
array('test.apk', 'application/octet-stream'), ['bogus.apk', 'application/vnd.android.package-archive'],
array('bogus.apk', 'application/vnd.android.package-archive'), ['bogus2.apk', 'application/wrong'],
array('bogus2.apk', 'application/wrong'), ];
)
); $fixedMimeTypes = [
['test.apk', 'application/vnd.android.package-archive'],
$this->repair->run(); ['bogus.apk', 'application/vnd.android.package-archive'],
['bogus2.apk', 'application/vnd.android.package-archive'],
// force mimetype reload ];
DummyFileCache::clearCachedMimeTypes();
$this->storage->getCache()->loadMimeTypes(); $this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
$this->checkEntries(
array(
array('test.apk', 'application/vnd.android.package-archive'),
array('bogus.apk', 'application/vnd.android.package-archive'),
array('bogus2.apk', 'application/vnd.android.package-archive'),
)
);
} }
/** /**
* Test renaming the postscript mime types * Test renaming the postscript mime types
*/ */
public function testRenamePostscriptMimeType() { public function testRenamePostscriptMimeType() {
$this->addEntries( $currentMimeTypes = [
array( ['test.eps', 'application/octet-stream'],
array('test.eps', 'application/octet-stream'), ['test.ps', 'application/octet-stream'],
array('test.ps', 'application/octet-stream'), ];
)
);
$this->repair->run(); $fixedMimeTypes = [
['test.eps', 'application/postscript'],
// force mimetype reload ['test.ps', 'application/postscript'],
DummyFileCache::clearCachedMimeTypes(); ];
$this->storage->getCache()->loadMimeTypes();
$this->checkEntries( $this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
array(
array('test.eps', 'application/postscript'),
array('test.ps', 'application/postscript'),
)
);
} }
/** /**
* Test renaming the Raw mime types * Test renaming the Raw mime types
*/ */
public function testRenameRawMimeType() { public function testRenameRawMimeType() {
$this->addEntries( $currentMimeTypes = [
array( ['test.arw', 'application/octet-stream'],
array('test.arw', 'application/octet-stream'), ['test.cr2', 'application/octet-stream'],
array('test.cr2', 'application/octet-stream'), ['test.dcr', 'application/octet-stream'],
array('test.dcr', 'application/octet-stream'), ['test.dng', 'application/octet-stream'],
array('test.dng', 'application/octet-stream'), ['test.erf', 'application/octet-stream'],
array('test.erf', 'application/octet-stream'), ['test.iiq', 'application/octet-stream'],
array('test.iiq', 'application/octet-stream'), ['test.k25', 'application/octet-stream'],
array('test.k25', 'application/octet-stream'), ['test.kdc', 'application/octet-stream'],
array('test.kdc', 'application/octet-stream'), ['test.mef', 'application/octet-stream'],
array('test.mef', 'application/octet-stream'), ['test.nef', 'application/octet-stream'],
array('test.nef', 'application/octet-stream'), ['test.orf', 'application/octet-stream'],
array('test.orf', 'application/octet-stream'), ['test.pef', 'application/octet-stream'],
array('test.pef', 'application/octet-stream'), ['test.raf', 'application/octet-stream'],
array('test.raf', 'application/octet-stream'), ['test.rw2', 'application/octet-stream'],
array('test.rw2', 'application/octet-stream'), ['test.srf', 'application/octet-stream'],
array('test.srf', 'application/octet-stream'), ['test.sr2', 'application/octet-stream'],
array('test.sr2', 'application/octet-stream'), ['test.xrf', 'application/octet-stream'],
array('test.xrf', 'application/octet-stream'), ['CapitalExtension.DNG', 'application/octet-stream'],
array('CapitalExtension.DNG', 'application/octet-stream'), ];
)
); $fixedMimeTypes = [
['test.arw', 'image/x-dcraw'],
['test.cr2', 'image/x-dcraw'],
['test.dcr', 'image/x-dcraw'],
['test.dng', 'image/x-dcraw'],
['test.erf', 'image/x-dcraw'],
['test.iiq', 'image/x-dcraw'],
['test.k25', 'image/x-dcraw'],
['test.kdc', 'image/x-dcraw'],
['test.mef', 'image/x-dcraw'],
['test.nef', 'image/x-dcraw'],
['test.orf', 'image/x-dcraw'],
['test.pef', 'image/x-dcraw'],
['test.raf', 'image/x-dcraw'],
['test.rw2', 'image/x-dcraw'],
['test.srf', 'image/x-dcraw'],
['test.sr2', 'image/x-dcraw'],
['test.xrf', 'image/x-dcraw'],
['CapitalExtension.DNG', 'image/x-dcraw'],
];
$this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
}
$this->repair->run(); public function testRename3dImagesMimeType() {
$currentMimeTypes = [
['test.eps', 'application/octet-stream'],
['test.ps', 'application/octet-stream'],
];
// force mimetype reload $fixedMimeTypes = [
DummyFileCache::clearCachedMimeTypes(); ['test.eps', 'application/postscript'],
$this->storage->getCache()->loadMimeTypes(); ['test.ps', 'application/postscript'],
];
$this->checkEntries( $this->renameMimeTypes($currentMimeTypes, $fixedMimeTypes);
array(
array('test.arw', 'image/x-dcraw'),
array('test.cr2', 'image/x-dcraw'),
array('test.dcr', 'image/x-dcraw'),
array('test.dng', 'image/x-dcraw'),
array('test.erf', 'image/x-dcraw'),
array('test.iiq', 'image/x-dcraw'),
array('test.k25', 'image/x-dcraw'),
array('test.kdc', 'image/x-dcraw'),
array('test.mef', 'image/x-dcraw'),
array('test.nef', 'image/x-dcraw'),