]> source.dussan.org Git - nextcloud-server.git/commitdiff
only update file cache if the file is already indexed to avoid that we create a incom...
authorBjoern Schiessle <schiessle@owncloud.com>
Tue, 12 Nov 2013 14:55:59 +0000 (15:55 +0100)
committerBjoern Schiessle <schiessle@owncloud.com>
Tue, 12 Nov 2013 14:55:59 +0000 (15:55 +0100)
apps/files_encryption/lib/stream.php

index 5ce5caf80ce21d44e6ce001e1280137df5c329a4..6e2b2ceb27b1bd043098b9ca2965ebea8315204d 100644 (file)
@@ -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);