|
|
|
|
@ -189,7 +189,6 @@ class File extends Node implements IFile { |
|
|
|
|
} |
|
|
|
|
if (!$run || $renameOkay === false || $fileExists === false) { |
|
|
|
|
\OC_Log::write('webdav', 'renaming part file to final file failed', \OC_Log::ERROR); |
|
|
|
|
$partStorage->unlink($internalPartPath); |
|
|
|
|
throw new Exception('Could not rename part file to final file'); |
|
|
|
|
} |
|
|
|
|
} catch (\Exception $e) { |
|
|
|
|
@ -350,6 +349,7 @@ class File extends Node implements IFile { |
|
|
|
|
if ($chunk_handler->isComplete()) { |
|
|
|
|
list($storage,) = $this->fileView->resolvePath($path); |
|
|
|
|
$needsPartFile = $this->needsPartFile($storage); |
|
|
|
|
$partFile = null; |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
$targetPath = $path . '/' . $info['name']; |
|
|
|
|
@ -388,7 +388,7 @@ class File extends Node implements IFile { |
|
|
|
|
$info = $this->fileView->getFileInfo($targetPath); |
|
|
|
|
return $info->getEtag(); |
|
|
|
|
} catch (\Exception $e) { |
|
|
|
|
if ($partFile) { |
|
|
|
|
if ($partFile !== null) { |
|
|
|
|
$this->fileView->unlink($partFile); |
|
|
|
|
} |
|
|
|
|
$this->convertToSabreException($e); |
|
|
|
|
|