sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40394 from nextcloud/updater-change-mimetype-objectstore

pull/49685/head
John Molakvoæ 2024-12-11 08:40:58 +07:00 committed by GitHub
parent ed54713e6a 37199779de
commit 3baa91d842
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/private/Files/Cache/Updater.php
Unescape Escape View File

@ -213,21 +213,25 @@ class Updater implements IUpdater {
$sourceInfo = $sourceCache->get($source);
$sourceExtension = pathinfo($source, PATHINFO_EXTENSION);
$targetExtension = pathinfo($target, PATHINFO_EXTENSION);
$targetIsTrash = preg_match("/^d\d+$/", $targetExtension);
if ($sourceInfo !== false) {
if (!$this->storage->instanceOfStorage(ObjectStoreStorage::class)) {
$operation($sourceCache, $sourceInfo);
}
$sourceExtension = pathinfo($source, PATHINFO_EXTENSION);
$targetExtension = pathinfo($target, PATHINFO_EXTENSION);
$targetIsTrash = preg_match("/d\d+/", $targetExtension);
$isDir = $sourceInfo->getMimeType() === FileInfo::MIMETYPE_FOLDER;
} else {
$isDir = $this->storage->is_dir($target);
}
if ($sourceExtension !== $targetExtension && $sourceInfo->getMimeType() !== FileInfo::MIMETYPE_FOLDER && !$targetIsTrash) {
// handle mime type change
$mimeType = $this->storage->getMimeType($target);
$fileId = $this->cache->getId($target);
$this->cache->update($fileId, ['mimetype' => $mimeType]);
}
if ($sourceExtension !== $targetExtension && !$isDir && !$targetIsTrash) {
// handle mime type change
$mimeType = $this->storage->getMimeType($target);
$fileId = $this->cache->getId($target);
$this->cache->update($fileId, ['mimetype' => $mimeType]);
}
if ($sourceCache instanceof Cache) {

35
tests/lib/Files/Cache/UpdaterTest.php
Unescape Escape View File

@ -8,7 +8,10 @@
namespace Test\Files\Cache;
use OC\Files\Filesystem;
use OC\Files\ObjectStore\ObjectStoreStorage;
use OC\Files\ObjectStore\StorageObjectStore;
use OC\Files\Storage\Temporary;
use OCP\Files\Storage\IStorage;
/**
* Class UpdaterTest
@ -301,4 +304,36 @@ class UpdaterTest extends \Test\TestCase {
$this->assertEquals($old['mimetype'], $new['mimetype']);
}
}
public function changeExtensionProvider(): array {
return [
[new Temporary()],
[new ObjectStoreStorage(['objectstore' => new StorageObjectStore(new Temporary())])]
];
}
/**
* @dataProvider changeExtensionProvider
*/
public function testChangeExtension(IStorage $storage) {
$updater = $storage->getUpdater();
$cache = $storage->getCache();
$storage->file_put_contents('foo', 'qwerty');
$updater->update('foo');
$bareCached = $cache->get('foo');
$this->assertEquals('application/octet-stream', $bareCached->getMimeType());
$storage->rename('foo', 'foo.txt');
$updater->renameFromStorage($storage, 'foo', 'foo.txt');
$cached = $cache->get('foo.txt');
$this->assertEquals('text/plain', $cached->getMimeType());
$storage->rename('foo.txt', 'foo.md');
$updater->renameFromStorage($storage, 'foo.txt', 'foo.md');
$cachedTarget = $cache->get('foo.md');
$this->assertEquals('text/markdown', $cachedTarget->getMimeType());
}
}