From: Bjoern Schiessle Date: Tue, 12 Nov 2013 14:55:59 +0000 (+0100) Subject: only update file cache if the file is already indexed to avoid that we create a incom... X-Git-Tag: v6.0.0beta5~21^2~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e2fb8d7128d0022406d3cc22cda0439acb599f09;p=nextcloud-server.git only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry --- diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php index 5ce5caf80ce..6e2b2ceb27b 100644 --- a/apps/files_encryption/lib/stream.php +++ b/apps/files_encryption/lib/stream.php @@ -67,6 +67,7 @@ class Stream { * @var \OC\Files\View */ private $rootView; // a fsview object set to '/' + /** * @var \OCA\Encryption\Session */ @@ -528,20 +529,22 @@ class Stream { \OC_FileProxy::$enabled = $proxyStatus; } + // we need to update the file info for the real file, not for the + // part file. + $path = Helper::fixPartialFilePath($this->rawPath); + // get file info - $fileInfo = $this->rootView->getFileInfo($this->rawPath); - if (!is_array($fileInfo)) { - $fileInfo = array(); + $fileInfo = $this->rootView->getFileInfo($path); + if (is_array($fileInfo)) { + // set encryption data + $fileInfo['encrypted'] = true; + $fileInfo['size'] = $this->size; + $fileInfo['unencrypted_size'] = $this->unencryptedSize; + + // set fileinfo + $this->rootView->putFileInfo($path, $fileInfo); } - // set encryption data - $fileInfo['encrypted'] = true; - $fileInfo['size'] = $this->size; - $fileInfo['unencrypted_size'] = $this->unencryptedSize; - - // set fileinfo - $this->rootView->putFileInfo($this->rawPath, $fileInfo); - } return fclose($this->handle);