From fc35352122f0bfd07627d8e1f4773950116eb7cd Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 7 Mar 2018 13:33:35 +0100 Subject: [PATCH 1/2] disable part files for object stores Signed-off-by: Robin Appelman --- lib/private/Files/ObjectStore/ObjectStoreStorage.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php index 45c22a81a7..8adc12297d 100644 --- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php +++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php @@ -423,4 +423,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { public function hasUpdated($path, $time) { return false; } + + public function needsPartFile() { + return false; + } } From f5ef9e02b2a74c6bd8da9863062a7ecaddf60b8b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 8 Mar 2018 13:02:35 +0100 Subject: [PATCH 2/2] emit pre-hooks earlier when not using part files Signed-off-by: Robin Appelman --- apps/dav/lib/Connector/Sabre/File.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index 597e6ebef9..6a467e9eff 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -144,6 +144,8 @@ class File extends Node implements IFile { } else { // upload file directly as the final 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) @@ -188,11 +190,7 @@ class File extends Node implements IFile { try { $view = \OC\Files\Filesystem::getView(); - if ($view) { - $run = $this->emitPreHooks($exists); - } else { - $run = true; - } + $run = ($view && $needsPartFile) ? $this->emitPreHooks($exists) : true; try { $this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);