mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #11961 from nextcloud/backport/11931/stable14 

[14] Do not emit preHooks twice on non-part-storage
This commit is contained in:
Morris Jobke 2018-10-23 18:16:59 +02:00 committed by GitHub
parent 7894c40f54 e81f42333b
commit e88c8d15ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/dav/lib/Connector/Sabre/File.php
View File

@ -140,6 +140,8 @@ class File extends Node implements IFile {
list($partStorage) = $this->fileView->resolvePath($this->path); list($partStorage) = $this->fileView->resolvePath($this->path);
$needsPartFile = $partStorage->needsPartFile() && (strlen($this->path) > 1); $needsPartFile = $partStorage->needsPartFile() && (strlen($this->path) > 1);
$view = \OC\Files\Filesystem::getView();
if ($needsPartFile) { if ($needsPartFile) {
// mark file as partial while uploading (ignored by the scanner) // mark file as partial while uploading (ignored by the scanner)
$partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part'; $partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part';
@ -147,11 +149,11 @@ class File extends Node implements IFile {
// upload file directly as the final path // upload file directly as the final path
$partFilePath = $this->path; $partFilePath = $this->path;
$this->emitPreHooks($exists); if ($view && !$this->emitPreHooks($exists)) {
throw new Exception('Could not write to final file, canceled by hook');
}
} }
$view = \OC\Files\Filesystem::getView();
// 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)
/** @var \OC\Files\Storage\Storage $partStorage */ /** @var \OC\Files\Storage\Storage $partStorage */
list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath); list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath);
@ -159,9 +161,6 @@ class File extends Node implements IFile {
list($storage, $internalPath) = $this->fileView->resolvePath($this->path); list($storage, $internalPath) = $this->fileView->resolvePath($this->path);
try { try {
if (!$needsPartFile) { if (!$needsPartFile) {
if ($view && !$this->emitPreHooks($exists)) {
throw new Exception('Could not write to final file, canceled by hook');
}
$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE); $this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
} }