wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8715 from nextcloud/objectstore-no-part-files

Browse source 
disable part files for object stores
This commit is contained in:
Roeland Jago Douma 2018-03-08 20:52:16 +01:00 committed by GitHub
commit d05469959e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/dav/lib/Connector/Sabre/File.php
View file

@ -144,6 +144,8 @@ class File extends Node implements IFile {
} else { } else {
// upload file directly as the final path // upload file directly as the final path
$partFilePath = $this->path; $partFilePath = $this->path;
$this->emitPreHooks($exists);
} }
// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share) // the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
@ -188,11 +190,7 @@ class File extends Node implements IFile {
try { try {
$view = \OC\Files\Filesystem::getView(); $view = \OC\Files\Filesystem::getView();
if ($view) { $run = ($view && $needsPartFile) ? $this->emitPreHooks($exists) : true;
$run = $this->emitPreHooks($exists);
} else {
$run = true;
}
try { try {
$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE); $this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);

4
lib/private/Files/ObjectStore/ObjectStoreStorage.php
View file

@ -429,4 +429,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
public function hasUpdated($path, $time) { public function hasUpdated($path, $time) {
return false; return false;
} }
public function needsPartFile() {
return false;
}
} }